search for: create_metadata

This patch series adds stable bus and slot numbers for removable drives (CDs and floppies) when the guest is converted using virt-v2v or virt-p2v. Previously we were a bit random about this. After this patch series, the bus and slot numbers and preserved if at all possible. BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1238053 Rich.

..." ] else []) @ + [ target.target_overlay.ov_overlay_file; filename ] in + message (f_"Copying disk to %s (%s)") filename target.target_format; + if run_command cmd <> 0 then + error (f_"qemu-img command failed, see earlier errors"); + method virtual create_metadata : source -> target list -> target_buses -> guestcaps -> inspect -> target_firmware -> unit method keep_serial_console = true method install_rhev_apt = false diff --git a/v2v/types.mli b/v2v/types.mli index be9406100785..a3b89bbcc9b3 100644 --- a/v2v/types.mli +++ b/v2v/types...

...method virtual prepare_targets : source -> (string * overlay) list -> target_buses -> guestcaps -> inspect -> target_firmware -> target_file list method disk_create = (open_guestfs ())#disk_create + method disk_copied (_ : target) (_ : int) (_ : int) = () method virtual create_metadata : source -> target list -> target_buses -> guestcaps -> inspect -> target_firmware -> unit method keep_serial_console = true method install_rhev_apt = false diff --git a/v2v/types.mli b/v2v/types.mli index be9406100..bf573d56d 100644 --- a/v2v/types.mli +++ b/v2v/types.mli @...

..._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_copied t i nr_disks = + (* Get the UUID of the disk image. This file is written + * out...

...ned-off-by: Roman Kagan <rkagan@virtuozzo.com> --- v2v/v2v.ml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 703038c..cc36422 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -119,17 +119,7 @@ let rec main () = output#create_metadata source targets target_buses guestcaps inspect target_firmware; - (* Save overlays if --debug-overlays option was used. *) - if debug_overlays then ( - let overlay_dir = (new Guestfs.guestfs ())#get_cachedir () in - List.iter ( - fun ov -> - let sav...

...put#prepare_targets overlays in copy_targets targets input output This creates the target disks and copies them. (The real output#prepare_targets method takes the source struct as a parameter, but the actual objects only use the source.s_name and .s_hypervisor fields). * output#create_metadata source targets guestcaps inspect This creates the target metadata. What you want -- copy done elsewhere, convert in place, create metadata -- is a very different flow. It could look something like this: * let overlays = create_overlays source.s_disks in let g = Guestfs.guestfs () in pop...

...is list. > + * 'os' is the output storage domain (-os /rhev/data/<data center>/<data domain>) > + * this is already mounted path. > * > * Note it's good to fail here (early) if there are any problems, since > * the next time we are called (in {!create_metadata}) we have already > @@ -79,7 +78,18 @@ object > (List.length targets); > > let mp, uuid = > - Output_rhev.mount_and_check_storage_domain verbose (s_"Data Domain") os in > + let fields = string_nsplit "/" os in (* ... "data-center&...

...libvirt XML diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index 1271bdc2f5e3..9008b05079cd 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -143,7 +143,7 @@ class output_libvirt oc output_pool = object error_unless_uefi_firmware guestcaps.gcaps_arch method create_metadata source targets - target_buses guestcaps _ target_firmware = + target_buses guestcaps inspect target_firmware = (* We copied directly into the final pool directory. However we * have to tell libvirt. *) @@ -172,7 +172,7 @@ class outpu...

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

...tions = "-o glance" - method supported_firmware = [ TargetBIOS ] + method supported_firmware = [ TargetBIOS; TargetUEFI ] method prepare_targets source targets = (* This does nothing useful except to check that the user has @@ -66,9 +66,6 @@ object ) targets method create_metadata source targets _ guestcaps inspect target_firmware = - (* See #supported_firmware above. *) - assert (target_firmware = TargetBIOS); - (* The first disk, assumed to be the system disk, will be called * "guestname". Subsequent disks, assumed to be data disks, * will...

...rted_firmware = [ TargetBIOS ] + method supported_firmware = [ TargetBIOS; TargetUEFI ] (* RHV doesn't support serial consoles. This causes the conversion * step to remove it. @@ -270,12 +270,10 @@ object (* This is called after conversion to write the OVF metadata. *) method create_metadata source targets _ guestcaps inspect target_firmware = - (* See #supported_firmware above. *) - assert (target_firmware = TargetBIOS); (* Create the metadata. *) let ovf = Create_ovf.create_ovf source targets guestcaps inspect - output_alloc esd_uuid image_uuids vol_uuids vm_uu...

..._libvirt.ml b/v2v/output_libvirt.ml > index 1271bdc2f5e3..9008b05079cd 100644 > --- a/v2v/output_libvirt.ml > +++ b/v2v/output_libvirt.ml > @@ -143,7 +143,7 @@ class output_libvirt oc output_pool = object > error_unless_uefi_firmware guestcaps.gcaps_arch > > method create_metadata source targets > - target_buses guestcaps _ target_firmware = > + target_buses guestcaps inspect target_firmware = > (* We copied directly into the final pool directory. However we > * have to tell libvirt. > *) > @...

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

...libvirt XML diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index 1271bdc2f5e3..9008b05079cd 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -143,7 +143,7 @@ class output_libvirt oc output_pool = object error_unless_uefi_firmware guestcaps.gcaps_arch method create_metadata source targets - target_buses guestcaps _ target_firmware = + target_buses guestcaps inspect target_firmware = (* We copied directly into the final pool directory. However we * have to tell libvirt. *) @@ -172,7 +172,7 @@ class outpu...

On Thu, Oct 10, 2019 at 03:33:25PM +0100, Richard W.M. Jones wrote: >On Wed, Oct 09, 2019 at 02:19:46PM +0200, Martin Kletzander wrote: >> Even though this option is not to be used according to the manual, it: >> >> a) still might be useful even for machine-readable logs >> >> b) should not break the machine-readable output > >I'm a bit confused what

...opy then targets - else copy_targets targets input output output_alloc in + let targets = + if not do_copy then targets + else copy_targets targets input output output_alloc in - (* Create output metadata. *) - message (f_"Creating output metadata"); - output#create_metadata source targets target_buses guestcaps inspect - target_firmware; + (* Create output metadata. *) + message (f_"Creating output metadata"); + output#create_metadata source targets target_buses guestcaps inspect + target_...

changes in v2: - split patch in two - changed as per suggestions Tomáš Golembiovský (2): v2v: ovf: add firmware and machine type element v2v: enable UEFI for oVirt/RHV outputs v2v/create_ovf.ml | 12 +++++++++++- v2v/create_ovf.mli | 2 +- v2v/output_rhv.ml | 6 ++---- v2v/output_rhv_upload.ml | 4 ++--

...5582). - *) - let compat = if format <> "qcow2" then compat else Some "0.10" in - g#disk_create ?backingfile ?backingformat ?preallocation ?compat - ?clustersize path format size - (* This is called after conversion to write the OVF metadata. *) method create_metadata source targets _ guestcaps inspect target_firmware = (* See #supported_firmware above. *) -- 2.10.2

...target_firmware list method check_target_firmware (_ : guestcaps) (_ : target_firmware) = () method check_target_free_space (_ : source) (_ : target list) = () - method disk_create = (new Guestfs.guestfs ())#disk_create + method disk_create = (open_guestfs ())#disk_create method virtual create_metadata : source -> target list -> target_buses -> guestcaps -> inspect -> target_firmware -> unit method keep_serial_console = true end diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 88ae409..2f473eb 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -217,7 +217,7 @@ and create_overlays src_dis...