startupPolicty: Minor cleanups

This patch does some cleanups to my previous startupPolicy patchset.

diff --git a/daemon/remote.c b/daemon/remote.c
index f5141b959fb898c79ab9128baaf70b7466d1d6df..bd0c3e3a1e7727b0be8ff22c75ed7e5552b0c16b 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -497,6 +497,8 @@ static int remoteRelayDomainEventDiskChange(virConnectPtr conn ATTRIBUTE_UNUSED,
     return 0;
 
 mem_error:
+    VIR_FREE(oldSrcPath_p);
+    VIR_FREE(newSrcPath_p);
     virReportOOMError();
     return -1;
 }

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e349a8f84e5c7f566ae93e8dfa37aecd36bf2dd6..6e2d421527fdf941eea8088dd405f72a5f27b5c8 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2726,7 +2726,7 @@ virDomainDiskDefParseXML(virCapsPtr caps,
     if (startupPolicy) {
         int i;
 
-        if ((i = virDomainStartupPolicyTypeFromString(startupPolicy)) < 0) {
+        if ((i = virDomainStartupPolicyTypeFromString(startupPolicy)) <= 0) {
             virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                  _("unknown startupPolicy value '%s'"),
                                  startupPolicy);

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index e7b20d55e1643acd4d9e737bafb2cfa298f5ddb1..5295783397c672481cd84ba134659b5e4548e4ae 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1602,9 +1602,8 @@ qemuDomainCheckDiskPresence(struct qemud_driver *driver,
 {
     int ret = -1;
     int i;
-    int accessRet;
     virDomainDiskDefPtr disk;
-    char uuid[VIR_UUID_STRING_BUFLEN] ATTRIBUTE_UNUSED;
+    char uuid[VIR_UUID_STRING_BUFLEN];
     virDomainEventPtr event = NULL;
 
     virUUIDFormat(vm->def->uuid, uuid);
@@ -1615,11 +1614,10 @@ qemuDomainCheckDiskPresence(struct qemud_driver *driver,
         if (!disk->startupPolicy || !disk->src)
             continue;
 
-        if ((accessRet = virFileAccessibleAs(disk->src, F_OK,
-                                             driver->user,
-                                             driver->group)) >= 0) {
-            /* disk accessible or virFileAccessibleAs()
-             * terminated with signal*/
+        if (virFileAccessibleAs(disk->src, F_OK,
+                                driver->user,
+                                driver->group) >= 0) {
+            /* disk accessible */
             continue;
         }
 
@@ -1628,7 +1626,7 @@ qemuDomainCheckDiskPresence(struct qemud_driver *driver,
                 break;
 
             case VIR_DOMAIN_STARTUP_POLICY_MANDATORY:
-                virReportSystemError(-accessRet,
+                virReportSystemError(errno,
                                      _("cannot access file '%s'"),
                                      disk->src);
                 goto cleanup;
@@ -1636,7 +1634,7 @@ qemuDomainCheckDiskPresence(struct qemud_driver *driver,
 
             case VIR_DOMAIN_STARTUP_POLICY_REQUISITE:
                 if (!start_with_state) {
-                    virReportSystemError(-accessRet,
+                    virReportSystemError(errno,
                                          _("cannot access file '%s'"),
                                          disk->src);
                     goto cleanup;
@@ -1649,8 +1647,8 @@ qemuDomainCheckDiskPresence(struct qemud_driver *driver,
                 break;
         }
 
-        VIR_DEBUG("Droping disk '%s' on domain '%s' (UUID '%s') "
-                  "due to not accessible source '%s'",
+        VIR_DEBUG("Dropping disk '%s' on domain '%s' (UUID '%s') "
+                  "due to inaccessible source '%s'",
                   disk->dst, vm->def->name, uuid, disk->src);
 
         event = virDomainEventDiskChangeNewFromObj(vm, disk->src, NULL, disk->info.alias,