conf: disk: Extract checking of removable status

3fa8125f · Peter Krempa · 2d3557b2 · 3fa8125f
隐藏空白更改
内联并排

Showing with 7 addition and 6 deletion

src/conf/domain_conf.c src/conf/domain_conf.c +7 -6

未找到文件。
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6941,6 +6941,13 @@ virDomainDiskDefValidate(const virDomainDiskDef *def)
        return -1;
    }

+    if (def->removable != VIR_TRISTATE_SWITCH_ABSENT &&
+        def->bus != VIR_DOMAIN_DISK_BUS_USB) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("removable is only valid for usb disks"));
+        return -1;
+    }
+
    return 0;
 }

@@ -7423,12 +7430,6 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
                           _("unknown disk removable status '%s'"), removable);
            goto error;
        }
-
-        if (def->bus != VIR_DOMAIN_DISK_BUS_USB) {
-            virReportError(VIR_ERR_XML_ERROR, "%s",
-                           _("removable is only valid for usb disks"));
-            goto error;
-        }
    }

    if (devaddr) {