NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix xen capabilities data creation

Browse Source
This commit is contained in:
Daniel P. Berrange 2008-09-05 11:35:43 +00:00
parent e88295804a
commit f193e19536
5 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Sep 5 12:33:26 BST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/xen_unified.c, src/xen_internal.c, src/xen_internal.h,
tests/xencapstest.c: Pass connection object into capabilities
constructor since it needs to talk to XenD
Thu Sep 4 15:33:26 CEST 2008 Daniel Veillard <veillard@redhat.com> Thu Sep 4 15:33:26 CEST 2008 Daniel Veillard <veillard@redhat.com>
* src/storage_backend_fs.c: fix a signed/unsigned issue breaking * src/storage_backend_fs.c: fix a signed/unsigned issue breaking

18
src/xen_internal.c
View File

@ -2159,7 +2159,8 @@ struct guest_arch {
static virCapsPtr static virCapsPtr
xenHypervisorBuildCapabilities(const char *hostmachine, xenHypervisorBuildCapabilities(virConnectPtr conn,
const char *hostmachine,
int host_pae, int host_pae,
char *hvm_type, char *hvm_type,
struct guest_arch *guest_archs, struct guest_arch *guest_archs,
@ -2185,7 +2186,7 @@ xenHypervisorBuildCapabilities(const char *hostmachine,
if (sys_interface_version >= 4) { if (sys_interface_version >= 4) {
if (xenDaemonNodeGetTopology(NULL, caps) != 0) { if (xenDaemonNodeGetTopology(conn, caps) != 0) {
virCapabilitiesFree(caps); virCapabilitiesFree(caps);
return NULL; return NULL;
} }
@ -2271,7 +2272,8 @@ xenHypervisorBuildCapabilities(const char *hostmachine,
* Return the capabilities of this hypervisor. * Return the capabilities of this hypervisor.
*/ */
virCapsPtr virCapsPtr
xenHypervisorMakeCapabilitiesInternal(const char *hostmachine, xenHypervisorMakeCapabilitiesInternal(virConnectPtr conn,
const char *hostmachine,
FILE *cpuinfo, FILE *capabilities) FILE *cpuinfo, FILE *capabilities)
{ {
char line[1024], *str, *token; char line[1024], *str, *token;
@ -2404,7 +2406,8 @@ xenHypervisorMakeCapabilitiesInternal(const char *hostmachine,
} }
} }
if ((caps = xenHypervisorBuildCapabilities(hostmachine, if ((caps = xenHypervisorBuildCapabilities(conn,
hostmachine,
host_pae, host_pae,
hvm_type, hvm_type,
guest_archs, guest_archs,
@ -2425,7 +2428,7 @@ xenHypervisorMakeCapabilitiesInternal(const char *hostmachine,
* Return the capabilities of this hypervisor. * Return the capabilities of this hypervisor.
*/ */
virCapsPtr virCapsPtr
xenHypervisorMakeCapabilities(void) xenHypervisorMakeCapabilities(virConnectPtr conn)
{ {
virCapsPtr caps; virCapsPtr caps;
FILE *cpuinfo, *capabilities; FILE *cpuinfo, *capabilities;
@ -2451,7 +2454,10 @@ xenHypervisorMakeCapabilities(void)
} }
} }
caps = xenHypervisorMakeCapabilitiesInternal(utsname.machine, cpuinfo, capabilities); caps = xenHypervisorMakeCapabilitiesInternal(conn,
utsname.machine,
cpuinfo,
capabilities);
if (cpuinfo) if (cpuinfo)
fclose(cpuinfo); fclose(cpuinfo);

5
src/xen_internal.h
View File

@ -17,7 +17,7 @@
extern struct xenUnifiedDriver xenHypervisorDriver; extern struct xenUnifiedDriver xenHypervisorDriver;
int xenHypervisorInit (void); int xenHypervisorInit (void);
virCapsPtr xenHypervisorMakeCapabilities (void); virCapsPtr xenHypervisorMakeCapabilities (virConnectPtr conn);
/* The following calls are made directly by the Xen proxy: */ /* The following calls are made directly by the Xen proxy: */
@ -38,7 +38,8 @@ int xenHypervisorClose (virConnectPtr conn);
int xenHypervisorGetVersion (virConnectPtr conn, int xenHypervisorGetVersion (virConnectPtr conn,
unsigned long *hvVer); unsigned long *hvVer);
virCapsPtr virCapsPtr
xenHypervisorMakeCapabilitiesInternal(const char *hostmachine, xenHypervisorMakeCapabilitiesInternal(virConnectPtr conn,
const char *hostmachine,
FILE *cpuinfo, FILE *cpuinfo,
FILE *capabilities); FILE *capabilities);
char * char *

2
src/xen_unified.c
View File

@ -333,7 +333,7 @@ xenUnifiedOpen (virConnectPtr conn, xmlURIPtr uri, virConnectAuthPtr auth, int f
} }
} }
if (!(priv->caps = xenHypervisorMakeCapabilities())) { if (!(priv->caps = xenHypervisorMakeCapabilities(conn))) {
DEBUG0("Failed to make capabilities"); DEBUG0("Failed to make capabilities");
goto fail; goto fail;
} }

2
tests/xencapstest.c
View File

@ -49,7 +49,7 @@ static int testCompareFiles(const char *hostmachine,
if (!(fp2 = fopen(capabilities, "r"))) if (!(fp2 = fopen(capabilities, "r")))
goto fail; goto fail;
if (!(caps = xenHypervisorMakeCapabilitiesInternal(hostmachine, fp1, fp2))) if (!(caps = xenHypervisorMakeCapabilitiesInternal(NULL, hostmachine, fp1, fp2)))
goto fail; goto fail;
if (!(actualxml = virCapabilitiesFormatXML(caps))) if (!(actualxml = virCapabilitiesFormatXML(caps)))