mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-11 14:11:31 +00:00
qemu: Do NOT autoadd NUMA node for s390
In some cases, we might automatically add a NUMA node. But this doesn't work for s390 really, because in its commit v2.12.0-rc0~41^2~6 QEMU forbade specifying NUMA nodes for s390. Suppress automatic adding of NUMA node on our side. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: David Hildenbrand <david@redhat.com> Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
This commit is contained in:
parent
17f3a9114c
commit
a8ed747b9a
@ -7761,7 +7761,8 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!ARCH_IS_PPC64(def->os.arch)) {
|
||||
if (!ARCH_IS_PPC64(def->os.arch) &&
|
||||
!ARCH_IS_S390(def->os.arch)) {
|
||||
/* due to guest support, qemu would silently enable NUMA with one node
|
||||
* once the memory hotplug backend is enabled. To avoid possible
|
||||
* confusion we will enforce user originated numa configuration along
|
||||
|
@ -1805,6 +1805,7 @@ qemuDomainDefNumaAutoAdd(virDomainDef *def,
|
||||
|
||||
if (!abiUpdate ||
|
||||
!virDomainDefHasMemoryHotplug(def) ||
|
||||
qemuDomainIsS390CCW(def) ||
|
||||
virDomainNumaGetNodeCount(def->numa) > 0) {
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user