Fix uses of virFileMakePath

* src/lxc/lxc_container.c src/lxc/lxc_controller.c src/lxc/lxc_driver.c
  src/network/bridge_driver.c src/qemu/qemu_driver.c
  src/uml/uml_driver.c: virFileMakePath returns 0 for success, or the
  value of errno on failure, so error checking should be to test
  if non-zero, not if lower than 0

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 023d5536e5c46ec2463c8280f882767054aa53aa..539a1f499f8e14d9047fcb913208bf680fdd8b0c 100644 (file)
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -317,7 +317,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root)
         goto err;
     }
 
-    if ((rc = virFileMakePath(oldroot)) < 0) {
+    if ((rc = virFileMakePath(oldroot)) != 0) {
         virReportSystemError(NULL, rc,
                              _("Failed to create %s"),
                              oldroot);
@@ -339,7 +339,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root)
         goto err;
     }
 
-    if ((rc = virFileMakePath(newroot)) < 0) {
+    if ((rc = virFileMakePath(newroot)) != 0) {
         virReportSystemError(NULL, rc,
                              _("Failed to create %s"),
                              newroot);
@@ -407,7 +407,7 @@ static int lxcContainerMountBasicFS(virDomainFSDefPtr root)
     }
 
     for (i = 0 ; i < ARRAY_CARDINALITY(mnts) ; i++) {
-        if (virFileMakePath(mnts[i].dst) < 0) {
+        if (virFileMakePath(mnts[i].dst) != 0) {
             virReportSystemError(NULL, errno,
                                  _("Failed to mkdir %s"),
                                  mnts[i].src);
@@ -421,7 +421,7 @@ static int lxcContainerMountBasicFS(virDomainFSDefPtr root)
         }
     }
 
-    if ((rc = virFileMakePath("/dev/pts") < 0)) {
+    if ((rc = virFileMakePath("/dev/pts") != 0)) {
         virReportSystemError(NULL, rc, "%s",
                              _("Cannot create /dev/pts"));
         goto cleanup;
@@ -510,7 +510,7 @@ static int lxcContainerMountNewFS(virDomainDefPtr vmDef)
             return -1;
         }
 
-        if (virFileMakePath(vmDef->fss[i]->dst) < 0) {
+        if (virFileMakePath(vmDef->fss[i]->dst) != 0) {
             virReportSystemError(NULL, errno,
                                  _("Failed to create %s"),
                                  vmDef->fss[i]->dst);

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 3cecdceda719235144a7d0473b3f1ab6eb4076a8..63048154bc9a5a141a3573c2d10581dbbe82ba2a 100644 (file)
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -556,7 +556,7 @@ lxcControllerRun(virDomainDefPtr def,
             goto cleanup;
         }
 
-        if (virFileMakePath(devpts) < 0) {
+        if (virFileMakePath(devpts) != 0) {
             virReportSystemError(NULL, errno,
                                  _("Failed to make path %s"),
                                  devpts);

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index ec5ee6b86e8048a4dfb174261bcd62b4a484f9fb..d78f7f73eeed0db3af115a8e9fec7c0a300a18c0 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -1193,7 +1193,7 @@ static int lxcVmStart(virConnectPtr conn,
     char **veths = NULL;
     lxcDomainObjPrivatePtr priv = vm->privateData;
 
-    if ((r = virFileMakePath(driver->logDir)) < 0) {
+    if ((r = virFileMakePath(driver->logDir)) != 0) {
         virReportSystemError(conn, r,
                              _("Cannot create log directory '%s'"),
                              driver->logDir);

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 4385215bdf9707164bb1ea26d3e1c0007ca6ed68..08e5ee64d0eebae64289b5da0b9acd447abd7c6b 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -539,13 +539,13 @@ dhcpStartDhcpDaemon(virConnectPtr conn,
         return -1;
     }
 
-    if ((err = virFileMakePath(NETWORK_PID_DIR)) < 0) {
+    if ((err = virFileMakePath(NETWORK_PID_DIR)) != 0) {
         virReportSystemError(conn, err,
                              _("cannot create directory %s"),
                              NETWORK_PID_DIR);
         return -1;
     }
-    if ((err = virFileMakePath(NETWORK_STATE_DIR)) < 0) {
+    if ((err = virFileMakePath(NETWORK_STATE_DIR)) != 0) {
         virReportSystemError(conn, err,
                              _("cannot create directory %s"),
                              NETWORK_STATE_DIR);

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index fc9bf70a2d6b8fafb8f5c83603f4d7747fab3411..37ced2612dfac362baa4f3ce0b02347ad98d03b3 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1042,19 +1042,19 @@ qemudStartup(int privileged) {
             goto out_of_memory;
     }
 
-    if (virFileMakePath(qemu_driver->stateDir) < 0) {
+    if (virFileMakePath(qemu_driver->stateDir) != 0) {
         char ebuf[1024];
         VIR_ERROR(_("Failed to create state dir '%s': %s"),
                   qemu_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf));
         goto error;
     }
-    if (virFileMakePath(qemu_driver->libDir) < 0) {
+    if (virFileMakePath(qemu_driver->libDir) != 0) {
         char ebuf[1024];
         VIR_ERROR(_("Failed to create lib dir '%s': %s"),
                   qemu_driver->libDir, virStrerror(errno, ebuf, sizeof ebuf));
         goto error;
     }
-    if (virFileMakePath(qemu_driver->cacheDir) < 0) {
+    if (virFileMakePath(qemu_driver->cacheDir) != 0) {
         char ebuf[1024];
         VIR_ERROR(_("Failed to create cache dir '%s': %s"),
                   qemu_driver->cacheDir, virStrerror(errno, ebuf, sizeof ebuf));
@@ -2786,7 +2786,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
         vm->def->graphics[0]->data.vnc.port = port;
     }
 
-    if (virFileMakePath(driver->logDir) < 0) {
+    if (virFileMakePath(driver->logDir) != 0) {
         virReportSystemError(conn, errno,
                              _("cannot create log directory %s"),
                              driver->logDir);

diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index b8080909b5a1811096cbd473cd5b9eb4ed875c25..31cea5cd7f61b1ad4f850d5331201d03e34bcd7b 100644 (file)
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -419,7 +419,7 @@ umlStartup(int privileged) {
         goto error;
     }
 
-    if (virFileMakePath(uml_driver->monitorDir) < 0) {
+    if (virFileMakePath(uml_driver->monitorDir) != 0) {
         char ebuf[1024];
         VIR_ERROR(_("Failed to create monitor directory %s: %s"),
                uml_driver->monitorDir, virStrerror(errno, ebuf, sizeof ebuf));
@@ -840,7 +840,7 @@ static int umlStartVMDaemon(virConnectPtr conn,
         return -1;
     }
 
-    if (virFileMakePath(driver->logDir) < 0) {
+    if (virFileMakePath(driver->logDir) != 0) {
         virReportSystemError(conn, errno,
                              _("cannot create log directory %s"),
                              driver->logDir);