search for: libvirt_supports_json_raw_driver

https://bugzilla.redhat.com/show_bug.cgi?id=1448739

v2: - 1/3: same as in previous version - 2/3: add check for libvirt version - 3/3: restore the disabled test The libvirt patch [2] that should fix our problem with 'raw' driver that is mentioned in [1] was merged. To realy fix things, there is at least one thing we have to change on our side. We have to be explicit about the driver in the JSON we generate. [1]

...st refactoring. --- v2v/input_ova.ml | 139 +++++++++++++++++++++++++++---------------------------- 1 file changed, 69 insertions(+), 70 deletions(-) diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml index 72a63d3..9a6a615 100644 --- a/v2v/input_ova.ml +++ b/v2v/input_ova.ml @@ -40,6 +40,69 @@ let libvirt_supports_json_raw_driver () = else true +(* Untar part or all files from tar archive. If [paths] is specified it is + * a list of paths in the tar archive. + *) +let untar ?(format = "") ?paths file outdir = + let cmd = [ "tar"; sprintf "-x%sf" format; file; "-C"; outdir ]...

...let ovatmpdir = + let d = cachedir // "ova" in + Unix.mkdir d 0o700; + d in match detect_file_type ova with | `Tar -> @@ -85,15 +84,15 @@ let rec parse_ova ova = *) if qemu_img_supports_offset_and_size () && libvirt_supports_json_raw_driver () && - (untar_metadata ova tmpdir; - no_disks_are_compressed ova tmpdir) then - tmpdir, TarOptimized ova + (untar_metadata ova ovatmpdir; + no_disks_are_compressed ova ovatmpdir) then + ovatmpdir, TarOptimized ova...

https://bugzilla.redhat.com/show_bug.cgi?id=1570407 This turned into quite an in-depth refactoring of how we handle OVAs. It also fixes a potential security issue. Rich.

Since this new temporary directory will contain UNIX sockets for communicating with nbdkit, then its path must not be too long. Use the existing directory that libguestfs exposes for this, i.e. sockdir. --- v2v/nbdkit.ml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/v2v/nbdkit.ml b/v2v/nbdkit.ml index 65317f9b..46b20c9d 100644 --- a/v2v/nbdkit.ml +++ b/v2v/nbdkit.ml

A couple of patches cleaning up the -i ova code. These are both just refactoring (or should be at any rate). The second patch is best viewed with 'git show -w' to exclude whitespace changes. Rich.