External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Fake host capabilities properly

Browse Source 
Since we fake host CPU we should also fake host arch instead of taking
the real architecture tests are running on.
This commit is contained in:
Jiri Denemark 2011-02-15 15:24:39 +01:00
parent c106a83712
commit aa3b2e40f5
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/testutilsqemu.c
View File

@ -1,6 +1,5 @@
#include <config.h> #include <config.h>
#ifdef WITH_QEMU #ifdef WITH_QEMU
# include <sys/utsname.h>
# include <stdlib.h> # include <stdlib.h>
# include "testutilsqemu.h" # include "testutilsqemu.h"
@ -57,7 +56,6 @@ static virCapsGuestMachinePtr *testQemuAllocNewerMachines(int *nmachines)
} }
virCapsPtr testQemuCapsInit(void) { virCapsPtr testQemuCapsInit(void) {
struct utsname utsname;
virCapsPtr caps; virCapsPtr caps;
virCapsGuestPtr guest; virCapsGuestPtr guest;
virCapsGuestMachinePtr *machines = NULL; virCapsGuestMachinePtr *machines = NULL;
@ -94,8 +92,7 @@ virCapsPtr testQemuCapsInit(void) {
host_cpu_features /* features */ host_cpu_features /* features */
}; };
uname (&utsname); if ((caps = virCapabilitiesNew(host_cpu.arch,
if ((caps = virCapabilitiesNew(utsname.machine,
0, 0)) == NULL) 0, 0)) == NULL)
return NULL; return NULL;
@ -107,7 +104,8 @@ virCapsPtr testQemuCapsInit(void) {
if ((guest = virCapabilitiesAddGuest(caps, "hvm", "i686", 32, if ((guest = virCapabilitiesAddGuest(caps, "hvm", "i686", 32,
"/usr/bin/qemu", NULL, "/usr/bin/qemu", NULL,
nmachines, machines)) == NULL) nmachines, machines)) == NULL ||
!virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0))
goto cleanup; goto cleanup;
machines = NULL; machines = NULL;
@ -124,7 +122,8 @@ virCapsPtr testQemuCapsInit(void) {
if ((guest = virCapabilitiesAddGuest(caps, "hvm", "x86_64", 64, if ((guest = virCapabilitiesAddGuest(caps, "hvm", "x86_64", 64,
"/usr/bin/qemu-system-x86_64", NULL, "/usr/bin/qemu-system-x86_64", NULL,
nmachines, machines)) == NULL) nmachines, machines)) == NULL ||
!virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0))
goto cleanup; goto cleanup;
machines = NULL; machines = NULL;