提交 c2e9e907 编写于 作者: M Matthias Bolte

xencapstest: Don't fail when Xen is installed

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.
上级 ff4a31d9
...@@ -2246,7 +2246,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册