qemu: Move check that validates 'min_guarantee' to qemuDomainDefValidate

Introduce a validation callback for qemu and move checking of
min_guarantee to the new callback.

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index fd6d6d2a06920be5994f783bf106400f2538aa9d..7e64545066dc32b15563bca22387ce62c3b02958 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2168,6 +2168,22 @@ qemuDomainDefPostParse(virDomainDefPtr def,
     return ret;
 }
 
+
+static int
+qemuDomainDefValidate(const virDomainDef *def,
+                      virCapsPtr caps ATTRIBUTE_UNUSED,
+                      void *opaque ATTRIBUTE_UNUSED)
+{
+    if (def->mem.min_guarantee) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("Parameter 'min_guarantee' not supported by QEMU."));
+        return -1;
+    }
+
+    return 0;
+}
+
+
 static const char *
 qemuDomainDefaultNetModel(const virDomainDef *def,
                           virQEMUCapsPtr qemuCaps)
@@ -2419,6 +2435,7 @@ virDomainDefParserConfig virQEMUDriverDomainDefParserConfig = {
     .devicesPostParseCallback = qemuDomainDeviceDefPostParse,
     .domainPostParseCallback = qemuDomainDefPostParse,
     .assignAddressesCallback = qemuDomainDefAssignAddresses,
+    .domainValidateCallback = qemuDomainDefValidate,
     .features = VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG |
                 VIR_DOMAIN_DEF_FEATURE_OFFLINE_VCPUPIN
 };

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 799a37e3eafcfa825a919bf0f91f9040d2042b5a..2f5829c1d8b14c30a3616ccb3448e82d15921052 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4307,13 +4307,6 @@ qemuProcessStartValidateXML(virQEMUDriverPtr driver,
         virDomainDefValidate(vm->def, caps, 0, driver->xmlopt) < 0)
         return -1;
 
-    if (vm->def->mem.min_guarantee) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("Parameter 'min_guarantee' "
-                         "not supported by QEMU."));
-        return -1;
-    }
-
     return 0;
 }