virDomainDiskDef: Change type of discard to virDomainDiskDiscard

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 72664bd72b310352a8b5bf4b99c39ddaee995324..9a4252099eba0800941abd7c9d2e277248442c61 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9046,11 +9046,15 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *def,
     }
     VIR_FREE(tmp);
 
-    if ((tmp = virXMLPropString(cur, "discard")) &&
-        (def->discard = virDomainDiskDiscardTypeFromString(tmp)) <= 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("unknown disk discard mode '%s'"), tmp);
-        return -1;
+    if ((tmp = virXMLPropString(cur, "discard"))) {
+        int discard;
+
+        if ((discard = virDomainDiskDiscardTypeFromString(tmp)) <= 0) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("unknown disk discard mode '%s'"), tmp);
+            return -1;
+        }
+        def->discard = discard;
     }
     VIR_FREE(tmp);
 

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 3402b3f85a4e550722849c222e896abb2ad97853..eb4991a312719a2fd2874659d360e8f3cff5c7fa 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -579,7 +579,7 @@ struct _virDomainDiskDef {
     virDomainDeviceInfo info;
     virTristateBool rawio;
     virDomainDeviceSGIO sgio;
-    int discard; /* enum virDomainDiskDiscard */
+    virDomainDiskDiscard discard;
     unsigned int iothread; /* unused = 0, > 0 specific thread # */
     int detect_zeroes; /* enum virDomainDiskDetectZeroes */
     char *domain_name; /* backend domain name */