conf: disk: Mark VIR_DOMAIN_DISK_IO_DEFAULT as 0 and simplify parsing

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 5ac4beb2aa93c4fd1422641712f5c5f1886eb0fa..9c4edfac50524e4cf61f4facddddc0c2973cbb84 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6967,8 +6967,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
     }
 
     if (iotag) {
-        if ((def->iomode = virDomainDiskIoTypeFromString(iotag)) < 0 ||
-            def->iomode == VIR_DOMAIN_DISK_IO_DEFAULT) {
+        if ((def->iomode = virDomainDiskIoTypeFromString(iotag)) <= 0) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("unknown disk io mode '%s'"), iotag);
             goto cleanup;

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 1986f5358dc64840b023dbee80086376777ce207..555d45dc0b5d4baf217846a3277273b21cf8e4ee 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -622,7 +622,7 @@ typedef enum {
 } virDomainDiskGeometryTrans;
 
 typedef enum {
-    VIR_DOMAIN_DISK_IO_DEFAULT,
+    VIR_DOMAIN_DISK_IO_DEFAULT = 0,
     VIR_DOMAIN_DISK_IO_NATIVE,
     VIR_DOMAIN_DISK_IO_THREADS,