[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] Improve error reporting when libvirtd is not installed



From: "Daniel P. Berrange" <berrange redhat com>

Currently if you try to connect to a local libvirtd when
libvirtd is not in $PATH, you'll get an error

  error: internal error invalid use of command API

This is because remoteFindDaemonPath() returns NULL, which
causes us to pass NULL into virNetSocketConnectUNIX which
in turn causes us to pass NULL into virCommandNewArgList.

Adding missing error checks improves this to

  error: internal error Unable to locate libvirtd daemon in $PATH

* src/remote/remote_driver.c: Report error if libvirtd
  cannot be found
* src/rpc/virnetsocket.c: Report error if caller requested
  spawning of daemon, but provided no binary path
---
 src/remote/remote_driver.c |    8 +++++++-
 src/rpc/virnetsocket.c     |    6 ++++++
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 1fb0eca..755275a 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -321,6 +321,7 @@ doRemoteOpen (virConnectPtr conn,
         trans_ext,
         trans_tcp,
     } transport;
+    const char *daemonPath;
 
     /* We handle *ALL*  URIs here. The caller has rejected any
      * URIs we don't care about */
@@ -588,9 +589,14 @@ doRemoteOpen (virConnectPtr conn,
             VIR_DEBUG("Proceeding with sockname %s", sockname);
         }
 
+        if (!(daemonPath = remoteFindDaemonPath())) {
+            remoteError(VIR_ERR_INTERNAL_ERROR, "%s",
+                        _("Unable to locate libvirtd daemon in $PATH"));
+            goto failed;
+        }
         if (!(priv->client = virNetClientNewUNIX(sockname,
                                                  flags & VIR_DRV_OPEN_REMOTE_AUTOSTART,
-                                                 remoteFindDaemonPath())))
+                                                 daemonPath)))
             goto failed;
 
         priv->is_secure = 1;
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 2747f66..e5e2473 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -481,6 +481,12 @@ int virNetSocketNewConnectUNIX(const char *path,
 
     remoteAddr.len = sizeof(remoteAddr.data.un);
 
+    if (spawnDaemon && !binary) {
+        virNetError(VIR_ERR_INTERNAL_ERROR,
+                    _("Auto-spawn of daemon requested, but not binary specified"));
+        return -1;
+    }
+
     if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
         virReportSystemError(errno, "%s", _("Failed to create socket"));
         goto error;
-- 
1.7.7.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]