search for: cpu_socket

...; in + (* Get the <vcpu> field from the input XML. If not set then + * try calculating it from the <cpu> <topology> node. If that's + * not set either, then assume 1 vCPU. + *) + let vcpu = xpath_int "/domain/vcpu/text()" in + let vcpu = + match vcpu, cpu_sockets, cpu_cores, cpu_threads with + | Some vcpu, _, _, _ -> vcpu + | None, None, None, None -> 1 + | None, _, _, _ -> + let sockets = match cpu_sockets with None -> 1 | Some v -> v in + let cores = match cpu_cores with None -> 1 | Some v -&gt...

...; in + (* Get the <vcpu> field from the input XML. If not set then + * try calculating it from the <cpu> <topology> node. If that's + * not set either, then assume 1 vCPU. + *) + let vcpu = xpath_int "/domain/vcpu/text()" in + let vcpu = + match vcpu, cpu_sockets, cpu_cores, cpu_threads with + | Some vcpu, _, _, _ -> vcpu + | None, None, None, None -> 1 + | None, _, _, _ -> + let sockets = match cpu_sockets with None -> 1 | Some v -> v in + let cores = match cpu_cores with None -> 1 | Some...

...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 -> () + | Some vendor -> + push_back cpu (e "vendor" [] [PCData vendor]) + ); + (match...

.../create_libvirt_xml.ml index cbb85cf9a..582419f00 100644 --- a/v2v/create_libvirt_xml.ml +++ b/v2v/create_libvirt_xml.ml @@ -48,8 +48,7 @@ let create_libvirt_xml ?pool source target_buses guestcaps ]; 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 ( + source.s_cpu_topology <> None then ( let cpu = ref [] in (match source.s_cpu_vendor with @@ -62,22 +61,15 @@ let create_libvirt_xml ?pool source target_buses guestcaps...

...gt; field from the input XML. If not set then > + * try calculating it from the <cpu> <topology> node. If that's > + * not set either, then assume 1 vCPU. > + *) > + let vcpu = xpath_int "/domain/vcpu/text()" in > + let vcpu = > + match vcpu, cpu_sockets, cpu_cores, cpu_threads with > + | Some vcpu, _, _, _ -> vcpu > + | None, None, None, None -> 1 > + | None, _, _, _ -> > + let sockets = match cpu_sockets with None -> 1 | Some v -> v in > + let cores = match cpu_cores with N...

...gt; field from the input XML. If not set then > + * try calculating it from the <cpu> <topology> node. If that's > + * not set either, then assume 1 vCPU. > + *) > + let vcpu = xpath_int "/domain/vcpu/text()" in > + let vcpu = > + match vcpu, cpu_sockets, cpu_cores, cpu_threads with > + | Some vcpu, _, _, _ -> vcpu > + | None, None, None, None -> 1 > + | None, _, _, _ -> > + let sockets = match cpu_sockets with None -> 1 | Some v -> v in > + let cores = match cpu_cores...

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

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

...03156f3..2f90bee0c 100644 --- a/v2v/parse_libvirt_xml.ml +++ b/v2v/parse_libvirt_xml.ml @@ -111,9 +111,9 @@ let parse_libvirt_xml ?conn xml = | Some vcpu, _, _, _ -> vcpu | None, None, None, None -> 1 | None, _, _, _ -> - let sockets = match cpu_sockets with None -> 1 | Some v -> v in - let cores = match cpu_cores with None -> 1 | Some v -> v in - let threads = match cpu_threads with None -> 1 | Some v -> v in + let sockets = Option.default 1 cpu_sockets + and cores = Option.default 1 cpu_cores + an...

https://bugzilla.redhat.com/show_bug.cgi?id=1441197

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.

This time including the first commit ...