[libvirt] [PATCH v2 2/2] qemu: cpu: fix "full" CPU to include all "reported" CPU features

[Nikolay Shirokovskiy]

On Core i5 650 x86_64 kvm guest fail to start with error [1] for next cpu config:

  <cpu mode='host-model' check='partial'>
    <model fallback='allow'/>
    <feature policy='require' name='x2apic'/>
  </cpu>

The problem is in full CPU calculation in virQEMUCapsInitHostCPUModel.
It is supposed to include features emulated by qemu and missed on host. Some of
such features may be not included however.

For Core i5 650  host CPU is detected as Westmere and reported CPU as
SandyBridge. x2apic is missed on host and provided by installed qemu. The
feature is not mentioned in reported CPU features explicitly because SandyBridge
model include it. As a result full CPU does not include x2apic too.

Solution is to expand guest cpu features before updating fullCPU features.

[1] error: the CPU is incompatible with host CPU: \
       Host CPU does not provide required features: x2apic
---
 src/qemu/qemu_capabilities.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 35905e9..04f0f60 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3494,6 +3494,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
                             virDomainVirtType type)
 {
     virCPUDefPtr cpu = NULL;
+    virCPUDefPtr cpuExpanded = NULL;
     virCPUDefPtr migCPU = NULL;
     virCPUDefPtr hostCPU = NULL;
     virCPUDefPtr fullCPU = NULL;
@@ -3528,9 +3529,13 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
                                       NULL, NULL)))
             goto error;
 
-        for (i = 0; i < cpu->nfeatures; i++) {
-            if (cpu->features[i].policy == VIR_CPU_FEATURE_REQUIRE &&
-                virCPUDefUpdateFeature(fullCPU, cpu->features[i].name,
+        if (!(cpuExpanded = virCPUDefCopy(cpu)) ||
+            virCPUExpandFeatures(qemuCaps->arch, cpuExpanded) < 0)
+            goto error;
+
+        for (i = 0; i < cpuExpanded->nfeatures; i++) {
+            if (cpuExpanded->features[i].policy == VIR_CPU_FEATURE_REQUIRE &&
+                virCPUDefUpdateFeature(fullCPU, cpuExpanded->features[i].name,
                                        VIR_CPU_FEATURE_REQUIRE) < 0)
                 goto error;
         }
@@ -3552,6 +3557,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
     virQEMUCapsSetHostModel(qemuCaps, type, cpu, migCPU, fullCPU);
 
  cleanup:
+    virCPUDefFree(cpuExpanded);
     virCPUDefFree(hostCPU);
     return;
 
-- 
1.8.3.1