qemu: Make virQEMUCapsInitCPUModel testable

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 8554313bbe2c22fa77543124105bbe6f34e27775..5694d0ba4339ecbb9b83feef6a135b269bd3e962 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3222,7 +3222,7 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,
  *          1 when the caller should fall back to using virCapsPtr->host.cpu,
  *         -1 on error.
  */
-static int
+int
 virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
                         virDomainVirtType type,
                         virCPUDefPtr cpu)
@@ -3286,6 +3286,18 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
 }
 
 
+void
+virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps,
+                           virDomainVirtType type,
+                           qemuMonitorCPUModelInfoPtr modelInfo)
+{
+    if (type == VIR_DOMAIN_VIRT_KVM)
+        qemuCaps->kvmCPUModelInfo = modelInfo;
+    else
+        qemuCaps->tcgCPUModelInfo = modelInfo;
+}
+
+
 static int
 virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsPtr qemuCaps,
                                 xmlXPathContextPtr ctxt,
@@ -3385,10 +3397,7 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsPtr qemuCaps,
         }
     }
 
-    if (virtType == VIR_DOMAIN_VIRT_KVM)
-        qemuCaps->kvmCPUModelInfo = hostCPU;
-    else
-        qemuCaps->tcgCPUModelInfo = hostCPU;
+    virQEMUCapsSetCPUModelInfo(qemuCaps, virtType, hostCPU);
     hostCPU = NULL;
     ret = 0;
 

diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h
index 4cff4a45e90be564e192cfd73dc0cec3e12b2679..e0544f273b2ef37e296f227bfb1f35b81fa9e931 100644 (file)
--- a/src/qemu/qemu_capspriv.h
+++ b/src/qemu/qemu_capspriv.h
@@ -77,4 +77,14 @@ void
 virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
                             virCapsPtr caps,
                             virDomainVirtType type);
+
+int
+virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
+                        virDomainVirtType type,
+                        virCPUDefPtr cpu);
+
+void
+virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps,
+                           virDomainVirtType type,
+                           qemuMonitorCPUModelInfoPtr modelInfo);
 #endif