External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-27 06:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

xencapstest: Don't fail when Xen is installed

Browse Source 
xencapstest calls xenHypervisorMakeCapabilitiesInternal with conn == NULL
which calls xenDaemonNodeGetTopology with conn == NULL when a recent
enough Xen was detected (sys_interface_version >= SYS_IFACE_MIN_VERS_NUMA).
But xenDaemonNodeGetTopology insists in having conn != NULL and fails,
because it expects to be able to talk to an actual xend.

We cannot do that in a 'make check' test. Therefore, only call the xend
subdriver function when conn isn't NULL.

Reported by Andy Howell and Jim Fehlig.
This commit is contained in:
Matthias Bolte 2010-11-09 23:38:12 +01:00
parent ff4a31d969
commit c2e9e90742
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xen/xen_hypervisor.c
View File

@ -2246,7 +2246,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
goto no_memory; goto no_memory;
if (sys_interface_version >= SYS_IFACE_MIN_VERS_NUMA) { if (sys_interface_version >= SYS_IFACE_MIN_VERS_NUMA && conn != NULL) {
if (xenDaemonNodeGetTopology(conn, caps) != 0) { if (xenDaemonNodeGetTopology(conn, caps) != 0) {
virCapabilitiesFree(caps); virCapabilitiesFree(caps);
return NULL; return NULL;