mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-27 19:11:16 +00:00
qemu_domain: Deduplicate targetNode check in qemuDomainDefValidateMemoryHotplugDevice()
If a domain has NUMA configured, then all <memory/> devices (except for 'virtio-pmem') need to have targetNode set. There are two checks inside of qemuDomainDefValidateMemoryHotplugDevice() for this: one inside of big switch() statement, which only checks 'dimm' and 'nvdimm' cases, and the other at the end of the function that checks all models (except for 'virtio-pmem'). Let's keep the latter and remove the former as the latter covers the former too. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Kristina Hanicova <khanicov@redhat.com>
This commit is contained in:
parent
b9eeeebddb
commit
851c5f075b
@ -9189,15 +9189,6 @@ qemuDomainDefValidateMemoryHotplugDevice(const virDomainMemoryDef *mem,
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (virDomainNumaGetNodeCount(def->numa) != 0) {
|
|
||||||
if (mem->targetNode == -1) {
|
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
|
||||||
_("target NUMA node needs to be specified for "
|
|
||||||
"memory device"));
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mem->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM) {
|
if (mem->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM) {
|
||||||
if (mem->info.addr.dimm.slot >= def->mem.memory_slots) {
|
if (mem->info.addr.dimm.slot >= def->mem.memory_slots) {
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
||||||
|
Loading…
Reference in New Issue
Block a user