From: Daniel Henrique Barboza <danielhb413@gmail.com>
Date: Wed, 14 Oct 2020 18:01:24 +0000 (-0300)
Subject: qemu_validate.c: move NUMA HMAT check to qemuValidateDomainDefNuma()
X-Git-Tag: v6.9.0-rc1~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e06c8d6dfd5e3cad00f406a24dbb1f01c5419266;p=thirdparty%2Flibvirt.git

qemu_validate.c: move NUMA HMAT check to qemuValidateDomainDefNuma()

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 5db4ef57ac..1e1571b966 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -753,13 +753,22 @@ qemuValidateDomainDefNuma(const virDomainDef *def,
         return -1;
     }
 
-    if (virDomainNumaHasHMAT(def->numa) ||
-        !virQEMUCapsGetMachineNumaMemSupported(qemuCaps,
+    if (!virQEMUCapsGetMachineNumaMemSupported(qemuCaps,
                                                def->virtType,
                                                def->os.machine)) {
         needBacking = true;
     }
 
+    if (virDomainNumaHasHMAT(def->numa)) {
+        needBacking = true;
+
+        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_NUMA_HMAT)) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("HMAT is not supported with this QEMU"));
+            return -1;
+        }
+    }
+
     if (needBacking && !hasMemoryCap) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("NUMA without specified memory backing is not "
@@ -1068,13 +1077,6 @@ qemuValidateDomainDef(const virDomainDef *def,
         }
     }
 
-    if (virDomainNumaHasHMAT(def->numa) &&
-        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_NUMA_HMAT)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("HMAT is not supported with this QEMU"));
-        return -1;
-    }
-
     if (def->genidRequested &&
         !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VMGENID)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",