From: Guido Günther <agx@sigxcpu.org>
Date: Sun, 4 Dec 2011 14:26:23 +0000 (+0100)
Subject: remote_driver: don't fail if keepalive check fails
X-Git-Tag: v0.9.8~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fcee135e816a59bea96768feb15e6f32db328ef;p=thirdparty%2Flibvirt.git

remote_driver: don't fail if keepalive check fails

Otherwise connections to older libvirt abort with:

$ virsh -c qemu+ssh://host.example.com/system list
error: invalid connection pointer in virDrvSupportsFeature
error: failed to connect to the hypervisor

Tested against 0.8.3 and 0.9.8-rc2.
---

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 556c90c438..1fb0eca2d5 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -678,10 +678,8 @@ doRemoteOpen (virConnectPtr conn,
         rc = call(conn, priv, 0, REMOTE_PROC_SUPPORTS_FEATURE,
                   (xdrproc_t)xdr_remote_supports_feature_args, (char *) &args,
                   (xdrproc_t)xdr_remote_supports_feature_ret, (char *) &ret);
-        if (rc == -1)
-            goto failed;
 
-        if (ret.supported) {
+        if (rc != -1 && ret.supported) {
             priv->serverKeepAlive = true;
         } else {
             VIR_INFO("Disabling keepalive protocol since it is not supported"