From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 18 Dec 2012 19:50:24 +0000 (+0000)
Subject: Fix libxl driver for virArch changes
X-Git-Tag: v1.0.2-rc1~369
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8db1f2d228bb2f27a729a873dcdb81ce3c7c38fd;p=thirdparty%2Flibvirt.git

Fix libxl driver for virArch changes
---

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index c7e350a911..5f02b9542d 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -119,7 +119,7 @@ libxlNextFreeVncPort(libxlDriverPrivatePtr driver, int startPort)
 
 
 static int libxlDefaultConsoleType(const char *ostype,
-                                   const char *arch ATTRIBUTE_UNUSED)
+                                   virArch arch ATTRIBUTE_UNUSED)
 {
     if (STREQ(ostype, "hvm"))
         return VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL;
@@ -128,7 +128,7 @@ static int libxlDefaultConsoleType(const char *ostype,
 }
 
 static virCapsPtr
-libxlBuildCapabilities(const char *hostmachine,
+libxlBuildCapabilities(virArch hostarch,
                        int host_pae,
                        struct guest_arch *guest_archs,
                        int nr_guest_archs)
@@ -136,7 +136,7 @@ libxlBuildCapabilities(const char *hostmachine,
     virCapsPtr caps;
     int i;
 
-    if ((caps = virCapabilitiesNew(hostmachine, 1, 1)) == NULL)
+    if ((caps = virCapabilitiesNew(hostarch, 1, 1)) == NULL)
         goto no_memory;
 
     virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x00, 0x16, 0x3e });
@@ -326,7 +326,6 @@ libxlMakeCapabilitiesInternal(virArch hostarch,
                 nr_guest_archs++;
 
             guest_archs[i].arch = arch;
-            guest_archs[i].bits = bits;
             guest_archs[i].hvm = hvm;
 
             /* Careful not to overwrite a previous positive