External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 15:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Daniel Henrique Barboza 2020-10-14 15:01:24 -03:00
parent 27371bd517
commit e06c8d6dfd
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/qemu/qemu_validate.c
View File

@ -753,13 +753,22 @@ qemuValidateDomainDefNuma(const virDomainDef *def,
return -1; return -1;
} }
if (virDomainNumaHasHMAT(def->numa) || if (!virQEMUCapsGetMachineNumaMemSupported(qemuCaps,
!virQEMUCapsGetMachineNumaMemSupported(qemuCaps,
def->virtType, def->virtType,
def->os.machine)) { def->os.machine)) {
needBacking = true; 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) { if (needBacking && !hasMemoryCap) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("NUMA without specified memory backing is not " _("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 && if (def->genidRequested &&
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VMGENID)) { !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VMGENID)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",