search for: get_target_firmware

...(List.map string_of_target_firmware supported_firmware)); - - output#check_target_firmware guestcaps target_firmware; - - (match target_firmware with - | TargetBIOS -> () - | TargetUEFI -> info (f_"This guest requires UEFI on the target to boot.")); + let target_firmware = get_target_firmware inspect guestcaps source output in message (f_"Assigning disks to buses"); let target_buses = target_bus_assignment source targets guestcaps in @@ -820,6 +801,30 @@ and do_convert g inspect source keep_serial_console = guestcaps +and get_target_firmware inspect guestcaps so...

...45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/v2v/v2v.ml b/v2v/v2v.ml index c6a567a..c1bce1b 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -399,6 +399,30 @@ let do_convert g inspect source keep_serial_console = guestcaps +let get_target_firmware inspect guestcaps source output = + (* Does the guest require UEFI on the target? *) + message (f_"Checking if the guest needs BIOS or UEFI to boot"); + let target_firmware = + match source.s_firmware with + | BIOS -> TargetBIOS + | UEFI -> TargetUEFI + | UnknownFirmw...

...m <> ["*"] && (do_copy || debug_overlays) then ( @@ -86,29 +111,34 @@ let rec main () = do_fstrim g no_trim inspect; ); - message (f_"Closing the overlay"); + message (f_"Closing the %s") guestfs_kind; g#close (); - let target_firmware = get_target_firmware inspect guestcaps source output in + (match conversion_mode with + | In_place -> () + | Copying (overlays, targets) -> + let target_firmware = + get_target_firmware inspect guestcaps source output in - message (f_"Assigning disks to buses"); - let target_buses...

I'm going to push this because it's a test blocker, but FYI. Rich.

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

...ing fstrim on all the filesystems reduces the transfer size * because unused blocks are marked in the overlay and thus do @@ -99,8 +97,6 @@ let rec main () = ); message (f_"Closing the overlay"); - g#umount_all (); - g#shutdown (); g#close (); let target_firmware = get_target_firmware inspect guestcaps source output in -- 2.4.3

This series is an 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. Roman Kagan (3): v2v: add --in-place mode v2v: document --in-place v2v: add test for --in-place ---

...+928,14 @@ let main () = do_fstrim g no_trim inspect; ); - message (f_"Closing the overlay"); + message (f_"Closing the %s") guestfs_kind; g#close (); + if in_place then ( + message (f_"Finishing off"); + exit 0 + ); + let target_firmware = get_target_firmware inspect guestcaps source output in let target_buses = target_bus_assignment source targets guestcaps in let targets = -- 2.4.3

...OO LOW !"; - printf "\n%!"; - ); - - t - ) targets - ) (* do_copy *) in + else copy_targets targets input output output_alloc in (* Create output metadata. *) message (f_"Creating output metadata"); @@ -825,6 +713,119 @@ and get_target_firmware inspect guestcaps source output = target_firmware +and delete_target_on_exit = ref true + +and copy_targets targets input output output_alloc = + (* Copy the source to the output. *) + at_exit (fun () -> + if !delete_target_on_exit then ( + List.iter ( + fun t -> try u...

...en the output format is qcow2 (-of qcow2)"); + (* output#prepare_targets will fill in the target_file field. * estimate_target_size will fill in the target_estimated_size field. * actual_target_size will fill in the target_actual_size field. @@ -757,7 +762,7 @@ and get_target_firmware inspect guestcaps source output = and delete_target_on_exit = ref true -and copy_targets targets input output output_alloc = +and copy_targets targets input output output_alloc compressed = (* Copy the source to the output. *) at_exit (fun () -> if !delete_target_on_exit then ( @...

...sage (f_"Mapping filesystem data to avoid copying unused and blank areas"); do_fstrim g no_trim inspect; ); message (f_"Closing the %s") guestfs_kind; g#close (); if in_place then ( message (f_"Finishing off"); exit 0 ); let target_firmware = get_target_firmware inspect guestcaps source output in let target_buses = target_bus_assignment source targets guestcaps 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");...

...uest could boot with UEFI. *) This comment needs to document what are the strings in this list. > } > (** Inspection information. *) > > diff --git a/v2v/v2v.ml b/v2v/v2v.ml > index fe81df5..2527633 100644 > --- a/v2v/v2v.ml > +++ b/v2v/v2v.ml > @@ -555,7 +555,7 @@ and get_target_firmware inspect guestcaps source output = > | BIOS -> TargetBIOS > | UEFI -> TargetUEFI > | UnknownFirmware -> > - if inspect.i_uefi then TargetUEFI else TargetBIOS in > + if inspect.i_uefi = None then TargetBIOS else TargetUEFI in > let supported_fi...

On Tue, Aug 11, 2015 at 08:00:34PM +0300, Roman Kagan wrote: > + let overlays = > + if not in_place then create_overlays source.s_disks > + else [] in > + let targets = > + if not in_place then init_targets overlays source output output_format > + else [] in This doesn't solve the problem I raised before which is that overlays and targets should never be empty

...Some {pr} -> + let json = [ + "disks", JSON.List (List.map (fun i -> JSON.Int i) estimates); + "total", JSON.Int total + ] in + pr "%s\n" (JSON.string_of_doc ~fmt:JSON.Indented json) + (* Does the guest require UEFI on the target? *) and get_target_firmware inspect guestcaps source output = message (f_"Checking if the guest needs BIOS or UEFI to boot"); diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod index fa7836659..c6810aab7 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -796,6 +796,37 @@ C<root>. You will get an error...

...Some {pr} -> + let json = [ + "disks", JSON.List (List.map (fun i -> JSON.Int i) estimates); + "total", JSON.Int total + ] in + pr "%s\n" (JSON.string_of_doc ~fmt:JSON.Indented json) + (* Does the guest require UEFI on the target? *) and get_target_firmware inspect guestcaps source output = message (f_"Checking if the guest needs BIOS or UEFI to boot"); diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod index fa7836659..9b48917a1 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -796,6 +796,37 @@ C<root>. You will get an error...

v6: - Make the text output a bit nicer. - Changes as suggested to Measure_disk module temp file & json parsing. - Use jq to test JSON output. - Retest.

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

v5: - Normal output modified approx as suggested in previous email. - Machine readable output uses JSON.