[libvirt] [PATCH 1/2] tests: Fake host capabilities properly

Jiri Denemark jdenemar at redhat.com
Tue Feb 15 14:53:59 UTC 2011


Since we fake host CPU we should also fake host arch instead of taking
the real architecture tests are running on.
---
 tests/testutilsqemu.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index bfac307..fbbb6c1 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -95,7 +95,7 @@ virCapsPtr testQemuCapsInit(void) {
     };
 
     uname (&utsname);
-    if ((caps = virCapabilitiesNew(utsname.machine,
+    if ((caps = virCapabilitiesNew(host_cpu.arch,
                                    0, 0)) == NULL)
         return NULL;
 
@@ -107,7 +107,8 @@ virCapsPtr testQemuCapsInit(void) {
 
     if ((guest = virCapabilitiesAddGuest(caps, "hvm", "i686", 32,
                                          "/usr/bin/qemu", NULL,
-                                         nmachines, machines)) == NULL)
+                                         nmachines, machines)) == NULL ||
+        !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0))
         goto cleanup;
     machines = NULL;
 
@@ -124,7 +125,8 @@ virCapsPtr testQemuCapsInit(void) {
 
     if ((guest = virCapabilitiesAddGuest(caps, "hvm", "x86_64", 64,
                                          "/usr/bin/qemu-system-x86_64", NULL,
-                                         nmachines, machines)) == NULL)
+                                         nmachines, machines)) == NULL ||
+        !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0))
         goto cleanup;
     machines = NULL;
 
-- 
1.7.4.1




More information about the libvir-list mailing list