conf: disk: Mark VIR_DOMAIN_DISK_IO_DEFAULT as 0 and simplify parsing

ffaacefa · Peter Krempa · 8a3dea1f · ffaacefa · ffaacefa
隐藏空白更改
内联并排

Showing with 2 addition and 3 deletion

src/conf/domain_conf.c src/conf/domain_conf.c +1 -2

src/conf/domain_conf.h src/conf/domain_conf.h +1 -1

未找到文件。
--- 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;

--- 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,