virDomainDiskDef: Change type of error_policy to virDomainDiskErrorPolicy

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 33c6412642fcaa96ad7bc0b45e3875108e5ece1c..4a0358831ba76bcc46733f94422bbe93a597c261 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8976,11 +8976,15 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *def,
     }
     VIR_FREE(tmp);
 
-    if ((tmp = virXMLPropString(cur, "error_policy")) &&
-        (def->error_policy = virDomainDiskErrorPolicyTypeFromString(tmp)) <= 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("unknown disk error policy '%s'"), tmp);
-        return -1;
+    if ((tmp = virXMLPropString(cur, "error_policy"))) {
+        int error_policy;
+
+        if ((error_policy = virDomainDiskErrorPolicyTypeFromString(tmp)) <= 0) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("unknown disk error policy '%s'"), tmp);
+            return -1;
+        }
+        def->error_policy = error_policy;
     }
     VIR_FREE(tmp);
 

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 3675e26eb05bdd749933a7ddbdf06b05b7d50829..cacb9d0430b2b1c7851efd10c5ae63fdd497e9eb 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -567,7 +567,7 @@ struct _virDomainDiskDef {
     char *vendor;
     char *product;
     virDomainDiskCache cachemode;
-    int error_policy;  /* enum virDomainDiskErrorPolicy */
+    virDomainDiskErrorPolicy error_policy;
     int rerror_policy; /* enum virDomainDiskErrorPolicy */
     int iomode; /* enum virDomainDiskIo */
     virTristateSwitch ioeventfd;