search for: string_of_source

...message (f_"Opening the source %s") input#as_options; - let source = input#source () in - - (* Print source and stop. *) - if print_source then ( - printf (f_"Source guest information (--print-source option):\n"); - printf "\n"; - printf "%s\n" (string_of_source source); - exit 0 - ); - - if verbose () then printf "%s%!" (string_of_source source); - - (match source.s_hypervisor with - | OtherHV hv -> - warning (f_"unknown source hypervisor ('%s') in metadata") hv - | _ -> () - ); - - assert (source.s_name <...

..._version Config.host_cpu; - - if debug_gc then - at_exit (fun () -> Gc.compact()); - +let open_source input print_source = message (f_"Opening the source %s") input#as_options; let source = input#source () in @@ -68,7 +54,6 @@ let rec main () = printf "%s\n" (string_of_source source); exit 0 ); - if verbose () then printf "%s%!" (string_of_source source); (match source.s_hypervisor with @@ -87,6 +72,9 @@ let rec main () = assert (disk.s_qemu_uri <> ""); ) source.s_disks; + source + +let amend_source source output_na...

...gt; Gc.compact()); + message (f_"Opening the source %s") input#as_options; let source = input#source () in @@ -63,8 +66,6 @@ let rec main () = printf (f_"Source guest information (--print-source option):\n"); printf "\n"; printf "%s\n" (string_of_source source); - if debug_gc then - Gc.compact (); exit 0 ); @@ -457,9 +458,6 @@ let rec main () = message (f_"Finishing off"); delete_target_on_exit := false; (* Don't delete target on exit. *) - if debug_gc then - Gc.compact () - and inspect_source g root_c...

...source_firmware; s_display : source_display option; @@ -102,6 +100,11 @@ and source_sound = { } and source_sound_model = AC97 | ES1370 | ICH6 | ICH9 | PCSpeaker | SB16 | USBAudio +and source_cpu_topology = { + s_cpu_sockets : int; + s_cpu_cores : int; + s_cpu_threads : int; +} let rec string_of_source s = sprintf " source name: %s @@ -110,7 +113,7 @@ hypervisor type: %s nr vCPUs: %d CPU vendor: %s CPU model: %s - CPU topology: sockets: %s cores/socket: %s threads/core: %s + CPU topology: %s CPU features: %s firmware: %s display: %s @@ -129...

...types.ml +++ b/v2v/types.ml @@ -28,6 +28,7 @@ type source = { s_hypervisor : source_hypervisor; s_name : string; s_orig_name : string; + s_genid : string option; s_memory : int64; s_vcpu : int; s_cpu_vendor : string option; @@ -109,6 +110,7 @@ and source_cpu_topology = { let rec string_of_source s = sprintf " source name: %s hypervisor type: %s + VM genid: %s memory: %Ld (bytes) nr vCPUs: %d CPU vendor: %s @@ -128,6 +130,7 @@ NICs: " s.s_name (string_of_source_hypervisor s.s_hypervisor) + (Option.default "" s.s_genid)...

Shahar: This is the same patch as you posted, but I have rebased it on top of current HEAD. You'll have to do save the next email to a file, and do: git reset --hard HEAD^ git pull git am /path/to/saved_email There are no changes in this patch, except what is needed to make it compile. Will follow-up with comments. Rich.

..._map, no_trim, output_alloc, output_format, output_name, print_source, root_choice = Cmdline.parse_cmdline () in @@ -63,8 +63,6 @@ let rec main () = printf (f_"Source guest information (--print-source option):\n"); printf "\n"; printf "%s\n" (string_of_source source); - if debug_gc then - Gc.compact (); exit 0 ); @@ -461,10 +459,7 @@ let rec main () = ); message (f_"Finishing off"); - delete_target_on_exit := false; (* Don't delete target on exit. *) - - if debug_gc then - Gc.compact () + delete_target_on_e...

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

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

...type source = { > s_hypervisor : source_hypervisor; > s_name : string; > s_orig_name : string; > + s_genid : string option; > s_memory : int64; > s_vcpu : int; > s_cpu_vendor : string option; > @@ -109,6 +110,7 @@ and source_cpu_topology = { > let rec string_of_source s = > sprintf " source name: %s > hypervisor type: %s > + VM genid: %s > memory: %Ld (bytes) > nr vCPUs: %d > CPU vendor: %s > @@ -128,6 +130,7 @@ NICs: > " > s.s_name > (string_of_source_hypervisor s.s_hypervis...

...s_vcpu : int; + s_cpu_vendor : string option; + s_cpu_model : string option; + s_cpu_sockets : int option; + s_cpu_cores : int option; + s_cpu_threads : int option; s_features : string list; s_firmware : source_firmware; s_display : source_display option; @@ -102,6 +107,9 @@ let rec string_of_source s = hypervisor type: %s memory: %Ld (bytes) nr vCPUs: %d + CPU vendor: %s + CPU model: %s + CPU topology: sockets: %s cores/socket: %s threads/core: %s CPU features: %s firmware: %s display: %s @@ -118,6 +126,11 @@ NICs: (string_of_source_hype...

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.

...ot; (string_of_target_buses target_buses); + debug "%s" (string_of_target_buses target_buses); let targets = if not cmdline.do_copy then targets @@ -156,7 +155,7 @@ and open_source cmdline input = exit 0 ); - if verbose () then printf "%s%!" (string_of_source source); + debug "%s" (string_of_source source); (match source.s_hypervisor with | OtherHV hv -> @@ -230,7 +229,7 @@ and create_overlays src_disks = let cmd = sprintf "qemu-img create -q -f qcow2 -b %s -o %s %s" (quote qemu_uri) (quot...

Add a Common_utils.debug function for printing messages only when in verbose mode. Rich.

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

Deep in the discussion of this bug, unfortunately mostly in private comments: https://bugzilla.redhat.com/show_bug.cgi?id=1594515 we decided it'd be more flexible for RHV if we had a way to map individual NICs to target networks and bridges. This can be done by adding a new --mac option so you can specify the exact mapping you need: $ virt-v2v [...] \ --mac

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

This is tangentially related to: https://bugzilla.redhat.com/show_bug.cgi?id=1372668 The problem in that bug is that we didn't pass the source CPU model (Sandybridge in that case) through to the target RHV hypervisor. So when the Windows guest booted on the target it gives an error about CPU hardware being disconnected (although it otherwise boots and works fine). This patch series

v1 -> v2: - Support for passing topology through -o glance. - Support for passing topology through -o rhv. - Use bool for acpi/apic/pae struct fields in virt-p2v. - Write the xpath expression in error messages instead of file/line. - Fix more memory leaks in virt-p2v cpuid.c. - Passes make check & check-valgrind. There may be some other minor changes. I believe that everything

..., easier than asking users to tell us. *) - if verbose then + if verbose () then printf "%s: %s %s (%s)\n%!" prog Config.package_name Config.package_version Config.host_cpu; @@ -71,7 +71,7 @@ let rec main () = exit 0 ); - if verbose then printf "%s%!" (string_of_source source); + if verbose () then printf "%s%!" (string_of_source source); (match source.s_hypervisor with | OtherHV hv -> @@ -143,7 +143,7 @@ let rec main () = let cmd = sprintf "qemu-img create -q -f qcow2 -b %s -o %s %s" (quote qemu_ur...