search for: s_vcpu

...-) diff --git a/v2v/create_libvirt_xml.ml b/v2v/create_libvirt_xml.ml index 7830bc3..fc71965 100644 --- a/v2v/create_libvirt_xml.ml +++ b/v2v/create_libvirt_xml.ml @@ -47,6 +47,42 @@ let create_libvirt_xml ?pool source target_buses guestcaps e "vcpu" [] [PCData (string_of_int source.s_vcpu)] ]; + if source.s_cpu_vendor <> None || source.s_cpu_model <> None || + source.s_cpu_sockets <> None || source.s_cpu_cores <> None || + source.s_cpu_threads <> None then ( + let cpu = ref [] in + + (match source.s_cpu_vendor with + | None ->...

...threads_per_cpu"[] [PCData threads] ] - ) - else ( + (match source.s_cpu_topology with + | None -> [ e "rasd:num_of_sockets" [] [PCData "1"]; e "rasd:cpu_per_socket"[] [PCData (string_of_int source.s_vcpu)] ] + | Some { s_cpu_sockets = sockets; s_cpu_cores = cores; + s_cpu_threads = threads } -> + [ e "rasd:num_of_sockets" [] [PCData (string_of_int sockets)]; + e "rasd:cpu_per_socket"[] [PCData (string_of_int cores)]; +...

...ot; [] [PCData inspect.i_product_name]; - e "Description" [] [PCData ostype]; - ]; - - e "Section" ["xsi:type", "ovf:VirtualHardwareSection_Type"] [ - e "Info" [] [PCData (sprintf "%d CPU, %Ld Memory" source.s_vcpu memsize_mb)]; - e "Item" [] [ - e "rasd:Caption" [] [PCData (sprintf "%d virtual cpu" source.s_vcpu)]; - e "rasd:Description" [] [PCData "Number of virtual CPU"]; - e "rasd:InstanceId" [] [PCData &...

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

...100644 --- a/v2v/input_disk.ml +++ b/v2v/input_disk.ml @@ -80,6 +80,7 @@ class input_disk input_format disk = object let source = { s_hypervisor = UnknownHV; s_name = name; s_orig_name = name; + s_genid = None; s_memory = 2048L *^ 1024L *^ 1024L; (* 2048 MB *) s_vcpu = 1; (* 1 vCPU is a safe default *) s_cpu_vendor = None; diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml index c4711f902..bfd72dee4 100644 --- a/v2v/input_ova.ml +++ b/v2v/input_ova.ml @@ -189,6 +189,7 @@ class input_ova ova = object s_hypervisor = VMware;...

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

...b/v2v/input_disk.ml > @@ -80,6 +80,7 @@ class input_disk input_format disk = object > let source = { > s_hypervisor = UnknownHV; > s_name = name; s_orig_name = name; > + s_genid = None; > s_memory = 2048L *^ 1024L *^ 1024L; (* 2048 MB *) > s_vcpu = 1; (* 1 vCPU is a safe default *) > s_cpu_vendor = None; > diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml > index c4711f902..bfd72dee4 100644 > --- a/v2v/input_ova.ml > +++ b/v2v/input_ova.ml > @@ -189,6 +189,7 @@ class input_ova ova = object &gt...

...(string_of_source source); - - (match source.s_hypervisor with - | OtherHV hv -> - warning (f_"unknown source hypervisor ('%s') in metadata") hv - | _ -> () - ); - - assert (source.s_name <> ""); - assert (source.s_memory > 0L); - assert (source.s_vcpu >= 1); - if source.s_disks = [] then - error (f_"source has no hard disks!"); - List.iter ( - fun disk -> - assert (disk.s_qemu_uri <> ""); - ) source.s_disks; - - (* Map source name. *) - let source = - match output_name with - | None -> sou...

...h + | None -> "1" + | Some v -> string_of_int v); + ) + else ( + push_back properties ("hw_cpu_sockets", "1"); + push_back properties ("hw_cpu_cores", string_of_int source.s_vcpu); + ); + (match guestcaps.gcaps_block_bus with + | Virtio_SCSI -> + push_back properties ("hw_scsi_model", "virtio-scsi") + | Virtio_blk | IDE -> () + ); + (match inspect.i_major_version, inspect.i_minor_version with + | 0, 0...

...cpu" model > - ); > + arg "-cpu" (Option.default "host" source.s_cpu_model); (Ah yes, we have our own Option module from common/mlstdutils/std_utils.ml*, not the "standard" one <https://v2.ocaml.org/api/Option.html>.) > > if source.s_vcpu > 1 then ( > (match source.s_cpu_topology with Reviewed-by: Laszlo Ersek <lersek at redhat.com>

When converting a guest with UEFI firmware, set the also hw_firmware_type=uefi property for all the disks of the guest, so Nova can properly boot the guest. --- v2v/output_glance.ml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/v2v/output_glance.ml b/v2v/output_glance.ml index b712d68..cfb19b4 100644 --- a/v2v/output_glance.ml +++ b/v2v/output_glance.ml @@ -41,7

...;apiVersion: kubevirt.io/v1alpha1\n"; + fpf "kind: OfflineVirtualMachine\n"; + fpf "metadata:\n"; + fpf " name: %s\n" name; + fpf "domain:\n"; + fpf " cpu:\n"; + fpf " cores: %d\n" source.s_vcpu; + fpf " resources:\n"; + fpf " requests:\n"; + fpf " memory: %Ld%s\n" (source.s_memory /^ 1024_L) "KiB"; + fpf " devices:\n"; + + (* virt-v2v (and indeed hardware) doesn't really work this way, +...

..._list body [ e "os" [] os_section; diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index 9e0c772fd..81357b55e 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -602,6 +602,8 @@ let rec create_ovf source targets guestcaps inspect source.s_vcpu memsize_mb)] ] in + (* XXX How to set machine type for Q35? *) + List.push_back virtual_hardware_section_items ( e "Item" [] ([ e "rasd:Caption" [] [PCData (sprintf "%d virtual cpu" source.s_vcpu)]; diff --git a/v2v/output_glanc...

..._list body [ e "os" [] os_section; diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index 2cf610333..92b13d827 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -602,6 +602,8 @@ let rec create_ovf source targets guestcaps inspect source.s_vcpu memsize_mb)] ] in + (* XXX How to set machine type for Q35? *) + List.push_back virtual_hardware_section_items ( e "Item" [] ([ e "rasd:Caption" [] [PCData (sprintf "%d virtual cpu" source.s_vcpu)]; diff --git a/v2v/output_glanc...

...uot; [] os_section; > diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml > index 9e0c772fd..81357b55e 100644 > --- a/v2v/create_ovf.ml > +++ b/v2v/create_ovf.ml > @@ -602,6 +602,8 @@ let rec create_ovf source targets guestcaps inspect > source.s_vcpu memsize_mb)] > ] in > > + (* XXX How to set machine type for Q35? *) > + > List.push_back virtual_hardware_section_items ( > e "Item" [] ([ > e "rasd:Caption" [] [PCData (sprintf "%d virtual cpu" source.s_vc...

Version 1 was here: https://listman.redhat.com/archives/libguestfs/2023-February/thread.html#30694 I made a few changes in v2 but overall decided to keep the now unused gcaps_arch_min_version capability. This doesn't preclude removing it in future if we think it's never going to be useful. I changed patch 1 so that to remove the long comment about how the field is used, anticipating the

In Std_utils we already extend Char and String. These commits take it a little further by extending List and adding a new Option submodule. All basically simple refactoring. Rich.

v2 -> v3: - Renamed List.assoc_ -> List.assoc_lbl. - Rebased on top of current master branch. Rich.

This time including the first commit ...

...ml +++ b/v2v/types.ml @@ -18,8 +18,9 @@ open Printf -open Common_gettext.Gettext +open Std_utils open Tools_utils +open Common_gettext.Gettext (* Types. See types.mli for documentation. *) @@ -126,8 +127,8 @@ NICs: (string_of_source_hypervisor s.s_hypervisor) s.s_memory s.s_vcpu - (match s.s_cpu_vendor with None -> "" | Some v -> v) - (match s.s_cpu_model with None -> "" | Some v -> v) + (Option.default "" s.s_cpu_vendor) + (Option.default "" s.s_cpu_model) (match s.s_cpu_sockets with None -> "-&q...