search for: targeturi

This changes the infrastructure to allow the target_file to be a QEMU URI. Rich.

...-> guestcaps -> inspect -> target_firmware -> target_file list method disk_create = (open_guestfs ())#disk_create + method disk_copy target compressed = + let filename = + match target.target_file with + | TargetFile filename -> qemu_input_filename filename + | TargetURI uri -> uri in + let cmd = + [ "qemu-img"; "convert" ] @ + (if not (quiet ()) then [ "-p" ] else []) @ + [ "-n"; "-f"; "qcow2"; "-O"; target.target_format ] @ + (if compressed then [ "-c" ] else...

...ed, Nov 20, 2019 at 03:06:55AM +0200, Nir Soffer wrote: > > diff --git a/v2v/v2v.ml b/v2v/v2v.ml > > index 03590c9e..58bb06c3 100644 > > --- a/v2v/v2v.ml > > +++ b/v2v/v2v.ml > > @@ -739,7 +739,9 @@ and copy_targets cmdline targets input output = > > | TargetURI uri -> uri in > > [ "qemu-img"; "convert" ] @ > > (if not (quiet ()) then [ "-p" ] else []) @ > > - [ "-n"; "-f"; "qcow2"; "-O"; t.target_format ] @ > > + (* XXX When usi...

...+ return "format" in sig.parameters + # oVirt imageio operations def parse_transfer_url(transfer): diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 03590c9e..58bb06c3 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -739,7 +739,9 @@ and copy_targets cmdline targets input output = | TargetURI uri -> uri in [ "qemu-img"; "convert" ] @ (if not (quiet ()) then [ "-p" ] else []) @ - [ "-n"; "-f"; "qcow2"; "-O"; t.target_format ] @ + (* XXX When using NBD we must use raw format, not the t...

...I<-i libvirtxml> option, you have to supply some diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 73edff2c4..a70310891 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -683,7 +683,10 @@ and copy_targets cmdline targets input output = fun t -> match t.target_file with | TargetURI _ -> () - | TargetFile s -> try unlink s with _ -> () + | TargetFile filename -> + if not (is_block_device filename) then ( + try unlink filename with _ -> () + ) ) targets ) ); @@ -713,27 +716,33 @@ and copy_targ...

...81,27 @@ object method supported_firmware = [ TargetBIOS; TargetUEFI ] method prepare_targets source targets = - let json_params = [ - "file.driver", JSON.String "null-co"; - "file.size", JSON.String "1E"; - ] in - let target_file = TargetURI ("json:" ^ JSON.string_of_doc json_params) in + if qemu_supports_null_co_device () then ( + let json_params = [ + "file.driver", JSON.String "null-co"; + "file.size", JSON.String "1E"; + ] in + let target_file = Targe...

...to supply some > diff --git a/v2v/v2v.ml b/v2v/v2v.ml > index 73edff2c4..a70310891 100644 > --- a/v2v/v2v.ml > +++ b/v2v/v2v.ml > @@ -683,7 +683,10 @@ and copy_targets cmdline targets input output = > fun t -> > match t.target_file with > | TargetURI _ -> () > - | TargetFile s -> try unlink s with _ -> () > + | TargetFile filename -> > + if not (is_block_device filename) then ( > + try unlink filename with _ -> () > + ) > ) targets > ) >...

This adds --print-target. In addition, v2 provides a machine-readable version (in JSON format). All of the record -> JSON boilerplate in this patch could be eliminated if we moved the baseline to OCaml 4.02. Rich.

...2v.ml @@ -744,7 +744,7 @@ and copy_targets cmdline targets input output = let cmd = let filename = match t.target_file with - | TargetFile filename -> "file:" ^ filename + | TargetFile filename -> qemu_input_filename filename | TargetURI uri -> uri in [ Guestfs_config.qemu_img; "convert" ] @ (if not (quiet ()) then [ "-p" ] else []) @ -- 2.16.2

On Wed, Nov 20, 2019 at 03:06:55AM +0200, Nir Soffer wrote: > diff --git a/v2v/v2v.ml b/v2v/v2v.ml > index 03590c9e..58bb06c3 100644 > --- a/v2v/v2v.ml > +++ b/v2v/v2v.ml > @@ -739,7 +739,9 @@ and copy_targets cmdline targets input output = > | TargetURI uri -> uri in > [ "qemu-img"; "convert" ] @ > (if not (quiet ()) then [ "-p" ] else []) @ > - [ "-n"; "-f"; "qcow2"; "-O"; t.target_format ] @ > + (* XXX When using NBD we must use r...

...+0200, Nir Soffer wrote: > > > diff --git a/v2v/v2v.ml b/v2v/v2v.ml > > > index 03590c9e..58bb06c3 100644 > > > --- a/v2v/v2v.ml > > > +++ b/v2v/v2v.ml > > > @@ -739,7 +739,9 @@ and copy_targets cmdline targets input output = > > > | TargetURI uri -> uri in > > > [ "qemu-img"; "convert" ] @ > > > (if not (quiet ()) then [ "-p" ] else []) @ > > > - [ "-n"; "-f"; "qcow2"; "-O"; t.target_format ] @ > > > +...

...*) val mutable rhv_cluster_uuid = None + (* List of disk UUIDs. *) + val mutable disks_uuids = [] method precheck () = Python_script.error_unless_python_interpreter_found (); @@ -374,23 +376,21 @@ If the messages above are not sufficient to diagnose the problem then add the TargetURI ("json:" ^ JSON.string_of_doc json_params) ) overlays - method create_metadata source targets _ guestcaps inspect target_firmware = - (* Get the UUIDs of each disk image. These files are written - * out by the nbdkit plugins on successful finalization of the + method disk...

...overlay_file = %s -ov_sd = %s -ov_virtual_size = %Ld -ov_source = %s + sprintf " overlay file: %s + overlay device name: %s +overlay virtual disk size: %Ld + overlay source qemu URI: %s " ov.ov_overlay_file ov.ov_sd @@ -304,12 +303,9 @@ and target_file = | TargetURI of string let string_of_target t = - sprintf "\ -target_file = %s -target_format = %s -target_estimated_size = %s -target_overlay = %s -target_overlay.ov_source = %s + sprintf " target file: %s + target format: %s +target estimated size: %s " (match t.targe...

RHV was connecting to the VMware source in order to find out the virtual disk size of the source disk(s), duplicating logic that virt-v2v already provides. This makes that information available using a new ‘virt-v2v --print-target option’. Note in order to get all the information, this has to actually perform the conversion step, so it takes 30 seconds or so before we reach the point where the

...a file. *) let json_param_file = tmpdir // sprintf "params%d.json" id in with_open_out @@ -401,7 +427,7 @@ If the messages above are not sufficient to diagnose the problem then add the "file.export", JSON.String "/"; ] in TargetURI ("json:" ^ JSON.string_of_doc json_params) - ) overlays + ) (List.combine overlays uuids) method disk_copied t i nr_disks = (* Get the UUID of the disk image. This file is written @@ -417,7 +443,14 @@ If the messages above are not sufficient to diagnose the problem then a...

Fixes some of the more egregious problems with v1, and also applies properly to the head of git without needing any other patches. Rich.

Add support for qcow2 disk format, enabled by imageio NBD backend in RHV 4.3. To use this feature manually, you can run virt-v2v with "-of qcow2". Here is example run: Source disk: $ qemu-img info /var/tmp/fedora-30.img image: /var/tmp/fedora-30.img file format: raw virtual size: 6 GiB (6442450944 bytes) disk size: 1.15 GiB virt-v2v: $ ./run virt-v2v \ -v \ -i disk

...p fst targets + + method create_metadata source targets _ guestcaps inspect target_firmware = + (* Upload the spooled disks. *) + List.iter ( + fun (t, disk_id) -> + let filename = + match t.target_file with + | TargetFile filename -> filename + | TargetURI _ -> assert false in + upload_one_disk run_python tmpdir conn output_password + t filename disk_id + ) (List.combine targets target_disk_ids); + + (* Create the metadata. *) + let ovf = + Create_ovf.create_ovf source targets guestcaps inspect +...

...p fst targets + + method create_metadata source targets _ guestcaps inspect target_firmware = + (* Upload the spooled disks. *) + List.iter ( + fun (t, disk_id) -> + let filename = + match t.target_file with + | TargetFile filename -> filename + | TargetURI _ -> assert false in + upload_one_disk run_python tmpdir conn output_password + rhv_cafile rhv_direct + t filename disk_id + ) (List.combine targets target_disk_ids); + + let image_uuids = target_disk_ids + and vol_uuids = List.map (f...

This patch series fixes various issues in the rhv-upload output mode: - properly find and use RHV resources - cleanup orphan disks, and possibly the current disk transfer on failure In reality, the first 4 patches deal with resources, and the other 4 with cleanups. The latter block can be theoretically sent alone -- I just happened to start working on it as part of my "let's fix