virDomainDiskDef: Change type of cachemode to virDomainDiskCache

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 720d56cf694c9596d64c5f2b8177263b0e880202..33c6412642fcaa96ad7bc0b45e3875108e5ece1c 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8964,11 +8964,15 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *def,
 
     def->driverName = virXMLPropString(cur, "name");
 
-    if ((tmp = virXMLPropString(cur, "cache")) &&
-        (def->cachemode = virDomainDiskCacheTypeFromString(tmp)) < 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("unknown disk cache mode '%s'"), tmp);
-        return -1;
+    if ((tmp = virXMLPropString(cur, "cache"))) {
+        int cachemode;
+
+        if ((cachemode = virDomainDiskCacheTypeFromString(tmp)) < 0) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("unknown disk cache mode '%s'"), tmp);
+            return -1;
+        }
+        def->cachemode = cachemode;
     }
     VIR_FREE(tmp);
 

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