virDomainDiskDef: Change type of iomode to virDomainDiskInfo

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

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index d808f5b260d8e15e7aa2d6de8424b8c575e32452..3402b3f85a4e550722849c222e896abb2ad97853 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -569,7 +569,7 @@ struct _virDomainDiskDef {
     virDomainDiskCache cachemode;
     virDomainDiskErrorPolicy error_policy;
     virDomainDiskErrorPolicy rerror_policy;
-    int iomode; /* enum virDomainDiskIo */
+    virDomainDiskIo iomode;
     virTristateSwitch ioeventfd;
     virTristateSwitch event_idx;
     virTristateSwitch copy_on_read;