From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 4 Aug 2016 11:16:55 +0000 (+0200)
Subject: testutilsqemu: Helpers for changing host CPU and arch
X-Git-Tag: v2.3.0-rc1~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=127e0b53ec5241f9421be2e89f37a622e7ddcfb6;p=thirdparty%2Flibvirt.git

testutilsqemu: Helpers for changing host CPU and arch

Changing a host architecture or a CPU is not as easy as assigning a new
value to the appropriate element in virCaps since there is a relation
between the CPU and host architecture (we don't really want to test
anything on an AArch64 host with core2duo CPU). This patch introduces
qemuTestSetHostArch and qemuTestSetHostCPU helpers which will make sure
the host architecture matches the host CPU.

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

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 11dd20e2c6..b569e0d5fd 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -334,7 +334,7 @@ virCapsPtr testQemuCapsInit(void)
         !(cpuHaswell = virCPUDefCopy(&cpuHaswellData)))
         goto cleanup;
 
-    caps->host.cpu = cpuDefault;
+    qemuTestSetHostCPU(caps, NULL);
 
     caps->host.nnumaCell_max = 4;
 
@@ -440,15 +440,42 @@ virCapsPtr testQemuCapsInit(void)
 
  cleanup:
     virCapabilitiesFreeMachines(machines, nmachines);
-    if (caps->host.cpu != cpuDefault)
-        virCPUDefFree(cpuDefault);
-    if (caps->host.cpu != cpuHaswell)
-        virCPUDefFree(cpuHaswell);
+    caps->host.cpu = NULL;
+    virCPUDefFree(cpuDefault);
+    virCPUDefFree(cpuHaswell);
     virObjectUnref(caps);
     return NULL;
 }
 
 
+void
+qemuTestSetHostArch(virCapsPtr caps,
+                    virArch arch)
+{
+    if (arch == VIR_ARCH_NONE)
+        arch = VIR_ARCH_X86_64;
+    caps->host.arch = arch;
+    qemuTestSetHostCPU(caps, NULL);
+}
+
+
+void
+qemuTestSetHostCPU(virCapsPtr caps,
+                   virCPUDefPtr cpu)
+{
+    virArch arch = caps->host.arch;
+
+    if (!cpu) {
+        if (ARCH_IS_X86(arch))
+            cpu = cpuDefault;
+    }
+
+    if (cpu)
+        caps->host.arch = cpu->arch;
+    caps->host.cpu = cpu;
+}
+
+
 virQEMUCapsPtr
 qemuTestParseCapabilities(const char *capsFile)
 {
diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h
index f2b71e91d8..7c678c9f01 100644
--- a/tests/testutilsqemu.h
+++ b/tests/testutilsqemu.h
@@ -19,8 +19,11 @@ virQEMUCapsPtr qemuTestParseCapabilities(const char *capsFile);
 
 extern virCPUDefPtr cpuDefault;
 extern virCPUDefPtr cpuHaswell;
-void testQemuCapsSetCPU(virCapsPtr caps,
-                        virCPUDefPtr hostCPU);
+
+void qemuTestSetHostArch(virCapsPtr caps,
+                        virArch arch);
+void qemuTestSetHostCPU(virCapsPtr caps,
+                        virCPUDefPtr cpu);
 
 int qemuTestDriverInit(virQEMUDriver *driver);
 void qemuTestDriverFree(virQEMUDriver *driver);