driver: ensure URI path is non-NULL to simplify drivers

Avoid the need for the drivers to explicitly check for a NULL path by
making sure it is at least the empty string.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index 980d145496d7e9d0f906c870c14ca45de086c175..24c4a9c80ea40ce5f2d5a69100addf9de89371f3 100644 (file)
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -199,7 +199,7 @@ bhyveConnectOpen(virConnectPtr conn,
 {
      virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
 
-     if (STRNEQ_NULLABLE(conn->uri->path, "/system")) {
+     if (STRNEQ(conn->uri->path, "/system")) {
          virReportError(VIR_ERR_INTERNAL_ERROR,
                         _("Unexpected bhyve URI path '%s', try bhyve:///system"),
                         conn->uri->path);

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 335d9a970d2a3acb96c1f8274a328935053f6ea4..c682c800caaf32f5ea3535839713ce45258dfe91 100644 (file)
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -852,7 +852,7 @@ esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth,
     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
 
     if (STRCASENEQ(conn->uri->scheme, "vpx") &&
-        conn->uri->path && STRNEQ(conn->uri->path, "/")) {
+        STRNEQ(conn->uri->path, "/")) {
         VIR_WARN("Ignoring unexpected path '%s' for non-vpx scheme '%s'",
                  conn->uri->path, conn->uri->scheme);
     }

diff --git a/src/libvirt.c b/src/libvirt.c
index 600beaa4d5c640fcb348d245ed3ddf0aadc6bcda..0b6bd6666ed710d86128665cde3e7f3359c6e248 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -1007,6 +1007,12 @@ virConnectOpenInternal(const char *name,
             goto failed;
         }
 
+        /* Avoid need for drivers to worry about NULLs, as
+         * no one needs to distinguish "" vs NULL */
+        if (ret->uri->path == NULL &&
+            VIR_STRDUP(ret->uri->path, "") < 0)
+            goto failed;
+
         VIR_DEBUG("Split \"%s\" to URI components:\n"
                   "  scheme %s\n"
                   "  server %s\n"
@@ -1016,7 +1022,7 @@ virConnectOpenInternal(const char *name,
                   uristr,
                   NULLSTR(ret->uri->scheme), NULLSTR(ret->uri->server),
                   NULLSTR(ret->uri->user), ret->uri->port,
-                  NULLSTR(ret->uri->path));
+                  ret->uri->path);
 
         if (ret->uri->scheme == NULL) {
             virReportError(VIR_ERR_NO_CONNECT,

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 45d0c99902739ba1c05ac16906d1e3e4af2b19c0..8808da8db193e980011c061c805ad2a9db30bf08 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -853,13 +853,12 @@ libxlConnectOpen(virConnectPtr conn,
     }
 
     /* /session isn't supported in libxenlight */
-    if (conn->uri->path &&
-        STRNEQ(conn->uri->path, "") &&
+    if (STRNEQ(conn->uri->path, "") &&
         STRNEQ(conn->uri->path, "/") &&
         STRNEQ(conn->uri->path, "/system")) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("unexpected Xen URI path '%s', try xen:///system"),
-                       NULLSTR(conn->uri->path));
+                       conn->uri->path);
         return VIR_DRV_OPEN_ERROR;
     }
 

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index ce541152caf86d73eadb42ce12f789f874e70e74..4097cef9348f42b55e5978f3775a992324673778 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -170,8 +170,7 @@ static virDrvOpenStatus lxcConnectOpen(virConnectPtr conn,
     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
 
     /* If path isn't '/' then they typoed, tell them correct path */
-    if (conn->uri->path != NULL &&
-        STRNEQ(conn->uri->path, "/") &&
+    if (STRNEQ(conn->uri->path, "/") &&
         STRNEQ(conn->uri->path, "/system")) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Unexpected LXC URI path '%s', try lxc:///system"),

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 7cdf65c7f5dc6eaeca2f7b1f30194c8c6f087762..9900e8bab7c1d999994dbc6d6fa7884ba5c6a8ac 100644 (file)
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -1355,8 +1355,7 @@ static virDrvOpenStatus openvzConnectOpen(virConnectPtr conn,
     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
 
     /* If path isn't /system, then they typoed, so tell them correct path */
-    if (conn->uri->path == NULL ||
-        STRNEQ(conn->uri->path, "/system")) {
+    if (STRNEQ(conn->uri->path, "/system")) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("unexpected OpenVZ URI path '%s', try openvz:///system"),
                        conn->uri->path);

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 55d459df5c77d03373e4456cb526c7ce600b6b5b..ed3d9feb58105dde308078eadad1c32b5e3b3ce3 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -1155,7 +1155,7 @@ phypConnectOpen(virConnectPtr conn,
     if (VIR_ALLOC(uuid_table) < 0)
         goto failure;
 
-    if (conn->uri->path) {
+    if (conn->uri->path[0] != '\0') {
         /* need to shift one byte in order to remove the first "/" of URI component */
         if (VIR_STRDUP(managed_system,
                        conn->uri->path + (conn->uri->path[0] == '/')) < 0)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d814e0a2edda0ce6633537ba57c1537e4a28842b..fcd79bd719dd87d8ee84794a16ffb565b8c4e825 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1150,12 +1150,6 @@ static virDrvOpenStatus qemuConnectOpen(virConnectPtr conn,
     }
 
     cfg = virQEMUDriverGetConfig(qemu_driver);
-    if (conn->uri->path == NULL) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("no QEMU URI path given, try %s"),
-                       cfg->uri);
-        goto cleanup;
-    }
 
     if (virQEMUDriverIsPrivileged(qemu_driver)) {
         if (STRNEQ(conn->uri->path, "/system") &&

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 56d496a84980df6f28d5153685ba0852196ce46e..eec7a82924be8a1b83045c5a64d51a05c87c9f15 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -1454,9 +1454,8 @@ testConnectOpen(virConnectPtr conn,
 
     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
 
-    if (!conn->uri->path
-        || conn->uri->path[0] == '\0'
-        || (conn->uri->path[0] == '/' && conn->uri->path[1] == '\0')) {
+    if (conn->uri->path[0] == '\0' ||
+        (conn->uri->path[0] == '/' && conn->uri->path[1] == '\0')) {
         virReportError(VIR_ERR_INVALID_ARG,
                        "%s", _("testOpen: supply a path or use test:///default"));
         return VIR_DRV_OPEN_ERROR;

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index cd6807d28a3f9657ce6775bf591a7c261e60a7c3..920af4c0104d00ca27da636fde2e91fd66fd7c17 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -517,12 +517,6 @@ vboxConnectOpen(virConnectPtr conn,
 
     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
 
-    if (conn->uri->path == NULL || STREQ(conn->uri->path, "")) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("no VirtualBox driver path specified (try vbox:///session)"));
-        return VIR_DRV_OPEN_ERROR;
-    }
-
     if (uid != 0) {
         if (STRNEQ(conn->uri->path, "/session")) {
             virReportError(VIR_ERR_INTERNAL_ERROR,

diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c
index 9e95ab01c5b996437e88d4b7e773104586ae70ac..1f31fa28dfe77e357c05a71f0b031e5b0d136870 100644 (file)
--- a/src/vbox/vbox_driver.c
+++ b/src/vbox/vbox_driver.c
@@ -58,12 +58,6 @@ static virDrvOpenStatus dummyConnectOpen(virConnectPtr conn,
 
     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
 
-    if (conn->uri->path == NULL || STREQ(conn->uri->path, "")) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("no VirtualBox driver path specified (try vbox:///session)"));
-        return VIR_DRV_OPEN_ERROR;
-    }
-
     if (uid != 0) {
         if (STRNEQ(conn->uri->path, "/session")) {
             virReportError(VIR_ERR_INTERNAL_ERROR,

diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index de3708aab340263afadef9d6af211b8ae409d76a..c8a3151fafac1a477fa140bd97c6b93303a37a0d 100644 (file)
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -131,7 +131,7 @@ vmwareConnectOpen(virConnectPtr conn,
     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
 
     /* If path isn't /session, then they typoed, so tell them correct path */
-    if (conn->uri->path == NULL || STRNEQ(conn->uri->path, "/session")) {
+    if (STRNEQ(conn->uri->path, "/session")) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("unexpected VMware URI path '%s', try vmwareplayer:///session, vmwarews:///session or vmwarefusion:///session"),
                        NULLSTR(conn->uri->path));

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 5867f1c9118819fb789586eaa5b4618da05c50a6..e51d968f281abb8d1fcb70ca24dfff33db98c2f8 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -359,7 +359,7 @@ vzConnectOpen(virConnectPtr conn,
     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
 
     /* From this point on, the connection is for us. */
-    if (STRNEQ_NULLABLE(conn->uri->path, "/system")) {
+    if (STRNEQ(conn->uri->path, "/system")) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Unexpected Virtuozzo URI path '%s', try vz:///system"),
                        conn->uri->path);