From e06c8d6dfd5e3cad00f406a24dbb1f01c5419266 Mon Sep 17 00:00:00 2001 From: Daniel Henrique Barboza Date: Wed, 14 Oct 2020 15:01:24 -0300 Subject: [PATCH] qemu_validate.c: move NUMA HMAT check to qemuValidateDomainDefNuma() Reviewed-by: Michal Privoznik Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_validate.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) 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", -- 2.47.2