search for: ov_sourc

...display errors to the user before doing too much - * work. - *) - message (f_"Initializing the target %s") output#as_options; - let targets = - List.map ( - fun ov -> - (* What output format should we use? *) - let format = - match output_format, ov.ov_source.s_format with - | Some format, _ -> format (* -of overrides everything *) - | None, Some format -> format (* same as backing format *) - | None, None -> - error (f_"disk %s (%s) has no defined format.\n\nThe input metadata did not define the d...

...root_choice : Types.root_choice; } diff --git a/v2v/types.ml b/v2v/types.ml index b89bd2fe2..c1f36fdb1 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -281,11 +281,10 @@ type overlay = { } let string_of_overlay ov = - sprintf "\ -ov_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 &qu...

...ad.ml @@ -361,13 +361,13 @@ If the messages above are not sufficient to diagnose the problem then add the *) let nr_disks = List.length targets in let image_uuids = - List.map ( - fun t -> + List.mapi ( + fun i t -> let id = t.target_overlay.ov_source.s_disk_id in let diskid_file = diskid_file_of_id id in if not (wait_for_file diskid_file finalization_timeout) then error (f_"transfer of disk %d/%d failed, see earlier error messages") - (id+1) nr_disks; + (i+1) nr_dis...

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

...rlays = - mapi ( - fun i (overlay_file, source) -> - let sd = "sd" ^ drive_name i in - let dev = "/dev/" ^ sd in - let vsize = g#blockdev_getsize64 dev in - - { ov_overlay_file = overlay_file; ov_sd = sd; - ov_virtual_size = vsize; ov_source = source } - ) overlays in - (* Work out where we will write the final output. Do this early * just so we can display errors to the user before doing too much * work. @@ -385,6 +338,7 @@ let rec main () = (* Save overlays if --debug-overlays option was used. *) if debug_over...

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.

...(* Get the UUID of the disk image. This file is written + * out by the nbdkit plugin on successful finalization of the * transfer. *) - let nr_disks = List.length targets in - let image_uuids = - List.mapi ( - fun i t -> - let id = t.target_overlay.ov_source.s_disk_id in - let diskid_file = diskid_file_of_id id in - if not (wait_for_file diskid_file finalization_timeout) then - error (f_"transfer of disk %d/%d failed, see earlier error messages") - (i+1) nr_disks; - let diskid = read_who...

...or (f_"internal error: qemu-img did not create overlay with backing file"); + + let sd = "sd" ^ drive_name i in + + let vsize = (new G.guestfs ())#disk_virtual_size overlay_file in + + { ov_overlay_file = overlay_file; ov_sd = sd; + ov_virtual_size = vsize; ov_source = source } + ) src_disks + let rec main () = (* Handle the command line. *) let input, output, @@ -122,40 +161,7 @@ let rec main () = let source = open_source input print_source in let source = amend_source source output_name network_map in - - (* Create a qcow2 v3 overlay to prot...

...ml.ml b/v2v/create_libvirt_xml.ml >> index 55e83e8bc1b9..180f3768792b 100644 >> --- a/v2v/create_libvirt_xml.ml >> +++ b/v2v/create_libvirt_xml.ml >> @@ -34,8 +34,102 @@ let find_target_disk targets { s_disk_id = id } = >> try List.find (fun t -> t.target_overlay.ov_source.s_disk_id = id) targets >> with Not_found -> assert false >> >> +let get_osinfo_id = function >> + | { i_type = "linux"; i_distro = "rhel"; >> + i_major_version = major; i_minor_version = minor } -> >> + Some (sprintf "...

I'm interested to hear opinions on whether this makes the code clearer, or not. This is virt-v2v, but many other virt-* tools work the same way, and analogous changes could be made. Currently when command line argument parsing is done in 'cmdline.ml' the list of parsed parameters is passed to the main program in a very long tuple. Each parameter is strongly typed, but not named (so

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

...letions(-) diff --git a/v2v/create_libvirt_xml.ml b/v2v/create_libvirt_xml.ml index 55e83e8bc1b9..180f3768792b 100644 --- a/v2v/create_libvirt_xml.ml +++ b/v2v/create_libvirt_xml.ml @@ -34,8 +34,102 @@ let find_target_disk targets { s_disk_id = id } = try List.find (fun t -> t.target_overlay.ov_source.s_disk_id = id) targets with Not_found -> assert false +let get_osinfo_id = function + | { i_type = "linux"; i_distro = "rhel"; + i_major_version = major; i_minor_version = minor } -> + Some (sprintf "http://redhat.com/rhel/%d.%d" major minor) + +...

...ges above are not sufficient to diagnose the problem then add the > *) > let nr_disks = List.length targets in > let image_uuids = > - List.map ( > - fun t -> > + List.mapi ( > + fun i t -> > let id = t.target_overlay.ov_source.s_disk_id in > let diskid_file = diskid_file_of_id id in > if not (wait_for_file diskid_file finalization_timeout) then > error (f_"transfer of disk %d/%d failed, see earlier error messages") > - (id+1) nr_disks; > +...

...+++++++++++++++++++++++++++++------------------------------ 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/v2v/v2v.ml b/v2v/v2v.ml index b3dfa07..c20cbf0 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -144,40 +144,7 @@ let create_overlays src_disks = ov_virtual_size = vsize; ov_source = source } ) src_disks -let rec main () = - (* Handle the command line. *) - let input, output, - debug_gc, debug_overlays, do_copy, network_map, no_trim, - output_alloc, output_format, output_name, print_source, root_choice = - Cmdline.parse_cmdline () in - - (* Print the version...

...ibvirt_xml.ml > >>index 55e83e8bc1b9..180f3768792b 100644 > >>--- a/v2v/create_libvirt_xml.ml > >>+++ b/v2v/create_libvirt_xml.ml > >>@@ -34,8 +34,102 @@ let find_target_disk targets { s_disk_id = id } = > >> try List.find (fun t -> t.target_overlay.ov_source.s_disk_id = id) targets > >> with Not_found -> assert false > >> > >>+let get_osinfo_id = function > >>+ | { i_type = "linux"; i_distro = "rhel"; > >>+ i_major_version = major; i_minor_version = minor } -> > >>...

...ts targets input output output_alloc in + else copy_targets targets input output output_alloc compressed in (* Create output metadata. *) message (f_"Creating output metadata"); @@ -247,7 +248,7 @@ and create_overlays src_disks = ov_virtual_size = vsize; ov_source = source } ) src_disks -and init_targets overlays source output output_format = +and init_targets overlays source output output_format compressed = (* Work out where we will write the final output. Do this early * just so we can display errors to the user before doing too much * w...

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

...g file"); let sd = "sd" ^ drive_name i in - let vsize = (new G.guestfs ())#disk_virtual_size overlay_file in + let vsize = (open_guestfs ())#disk_virtual_size overlay_file in { ov_overlay_file = overlay_file; ov_sd = sd; ov_virtual_size = vsize; ov_source = source } @@ -780,7 +780,7 @@ and copy_targets targets input output output_alloc = * backing file. Just sanity check this here. *) let overlay_file = t.target_overlay.ov_overlay_file in - if not ((new G.guestfs ())#disk_has_backing_file overlay_file) then + if no...

This series is a second attempt to add a mode of virt-v2v operation where it leaves the config and disk image conversion, rollback on errors, registering with the destination hypervisor, etc. to a third-party toolset, and performs only tuning of the guest OS to run in the KVM-based hypervisor. The first 14 patches are just refactoring and rearrangement of the code, factoring the implementation

...v2v/create_libvirt_xml.ml b/v2v/create_libvirt_xml.ml > index 55e83e8bc1b9..180f3768792b 100644 > --- a/v2v/create_libvirt_xml.ml > +++ b/v2v/create_libvirt_xml.ml > @@ -34,8 +34,102 @@ let find_target_disk targets { s_disk_id = id } = > try List.find (fun t -> t.target_overlay.ov_source.s_disk_id = id) targets > with Not_found -> assert false > > +let get_osinfo_id = function > + | { i_type = "linux"; i_distro = "rhel"; > + i_major_version = major; i_minor_version = minor } -> > + Some (sprintf "http://redhat.com/rhel...