From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 18 Dec 2012 19:32:15 +0000 (+0000)
Subject: Fix XenAPI driver for virArch changes
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=473011334ccd93e8efbb67f2561f1d4e54d212ae;p=libvirt.git

Fix XenAPI driver for virArch changes
---

diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 5a93aeac15..2d26cae11e 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -44,7 +44,7 @@
 
 
 static int xenapiDefaultConsoleType(const char *ostype,
-                                    const char *arch ATTRIBUTE_UNUSED)
+                                    virArch arch ATTRIBUTE_UNUSED)
 {
     if (STREQ(ostype, "hvm"))
         return VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL;
@@ -64,19 +64,19 @@ getCapsObject(void)
 {
     virCapsGuestPtr guest1, guest2;
     virCapsGuestDomainPtr domain1, domain2;
-    virCapsPtr caps = virCapabilitiesNew("x86_64", 0, 0);
+    virCapsPtr caps = virCapabilitiesNew(virArchFromHost(), 0, 0);
 
     if (!caps) {
         virReportOOMError();
         return NULL;
     }
-    guest1 = virCapabilitiesAddGuest(caps, "hvm", "x86_64", 0, "", "", 0, NULL);
+    guest1 = virCapabilitiesAddGuest(caps, "hvm", VIR_ARCH_X86_64, "", "", 0, NULL);
     if (!guest1)
         goto error_cleanup;
     domain1 = virCapabilitiesAddGuestDomain(guest1, "xen", "", "", 0, NULL);
     if (!domain1)
         goto error_cleanup;
-    guest2 = virCapabilitiesAddGuest(caps, "xen", "x86_64", 0, "", "", 0, NULL);
+    guest2 = virCapabilitiesAddGuest(caps, "xen", VIR_ARCH_X86_64, "", "", 0, NULL);
     if (!guest2)
         goto error_cleanup;
     domain2 = virCapabilitiesAddGuestDomain(guest2, "xen", "", "", 0, NULL);