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

Fix libxl driver for virArch changes

Browse Source
This commit is contained in:
Daniel P. Berrange 2012-12-18 19:50:24 +00:00
parent 392c192240
commit 8db1f2d228
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libxl/libxl_conf.c
View File

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