Fix test cases for virArch changes

This commit is contained in:
Daniel P. Berrange
2012-12-18 19:32:23 +00:00
parent 473011334c
commit 392c192240
9 changed files with 81 additions and 71 deletions
+4 -4
View File
@@ -7,7 +7,7 @@
#include "domain_conf.h"
static int testXenDefaultConsoleType(const char *ostype,
const char *arch ATTRIBUTE_UNUSED)
virArch arch ATTRIBUTE_UNUSED)
{
if (STREQ(ostype, "hvm"))
return VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL;
@@ -29,7 +29,7 @@ virCapsPtr testXenCapsInit(void) {
};
uname(&utsname);
if ((caps = virCapabilitiesNew(utsname.machine,
if ((caps = virCapabilitiesNew(VIR_ARCH_I686,
0, 0)) == NULL)
return NULL;
@@ -39,7 +39,7 @@ virCapsPtr testXenCapsInit(void) {
if ((machines = virCapabilitiesAllocMachines(x86_machines, nmachines)) == NULL)
goto cleanup;
if ((guest = virCapabilitiesAddGuest(caps, "hvm", "i686", 32,
if ((guest = virCapabilitiesAddGuest(caps, "hvm", VIR_ARCH_I686,
"/usr/lib/xen/bin/qemu-dm", NULL,
nmachines, machines)) == NULL)
goto cleanup;
@@ -57,7 +57,7 @@ virCapsPtr testXenCapsInit(void) {
if ((machines = virCapabilitiesAllocMachines(xen_machines, nmachines)) == NULL)
goto cleanup;
if ((guest = virCapabilitiesAddGuest(caps, "xen", "i686", 32,
if ((guest = virCapabilitiesAddGuest(caps, "xen", VIR_ARCH_I686,
"/usr/lib/xen/bin/qemu-dm", NULL,
nmachines, machines)) == NULL)
goto cleanup;