]> xenbits.xensource.com Git - libvirt.git/commitdiff
testutilsqemu: Add default CPU for PPC64 architectures
authorJiri Denemark <jdenemar@redhat.com>
Tue, 13 Sep 2016 20:27:09 +0000 (22:27 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Thu, 22 Sep 2016 13:40:08 +0000 (15:40 +0200)
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
tests/testutilsqemu.c
tests/testutilsqemu.h

index b569e0d5fdf4867fe4709d4aa77421d7ae710c4a..f59746a4d96c54bccc6217ee0ac4e50ac86652c7 100644 (file)
@@ -16,6 +16,7 @@
 
 virCPUDefPtr cpuDefault;
 virCPUDefPtr cpuHaswell;
+virCPUDefPtr cpuPower8;
 
 static virCPUFeatureDef cpuDefaultFeatures[] = {
     { (char *) "lahf_lm",   -1 },
@@ -92,6 +93,15 @@ static virCPUDef cpuHaswellData = {
     cpuHaswellFeatures,     /* features */
 };
 
+static virCPUDef cpuPower8Data = {
+    .type = VIR_CPU_TYPE_HOST,
+    .arch = VIR_ARCH_PPC64,
+    .model = (char *) "POWER8",
+    .sockets = 1,
+    .cores = 8,
+    .threads = 8,
+};
+
 static virCapsGuestMachinePtr *testQemuAllocMachines(int *nmachines)
 {
     virCapsGuestMachinePtr *machines;
@@ -331,7 +341,8 @@ virCapsPtr testQemuCapsInit(void)
         goto cleanup;
 
     if (!(cpuDefault = virCPUDefCopy(&cpuDefaultData)) ||
-        !(cpuHaswell = virCPUDefCopy(&cpuHaswellData)))
+        !(cpuHaswell = virCPUDefCopy(&cpuHaswellData)) ||
+        !(cpuPower8 = virCPUDefCopy(&cpuPower8Data)))
         goto cleanup;
 
     qemuTestSetHostCPU(caps, NULL);
@@ -443,6 +454,7 @@ virCapsPtr testQemuCapsInit(void)
     caps->host.cpu = NULL;
     virCPUDefFree(cpuDefault);
     virCPUDefFree(cpuHaswell);
+    virCPUDefFree(cpuPower8);
     virObjectUnref(caps);
     return NULL;
 }
@@ -468,6 +480,8 @@ qemuTestSetHostCPU(virCapsPtr caps,
     if (!cpu) {
         if (ARCH_IS_X86(arch))
             cpu = cpuDefault;
+        else if (ARCH_IS_PPC64(arch))
+            cpu = cpuPower8;
     }
 
     if (cpu)
index 7c678c9f017942636a8f95ac92c1caa42b14ddff..6d35116f36fc851369fb446fcfb00e50235d8dd6 100644 (file)
@@ -19,6 +19,7 @@ virQEMUCapsPtr qemuTestParseCapabilities(const char *capsFile);
 
 extern virCPUDefPtr cpuDefault;
 extern virCPUDefPtr cpuHaswell;
+extern virCPUDefPtr cpuPower8;
 
 void qemuTestSetHostArch(virCapsPtr caps,
                         virArch arch);