From b2e5469f35657b7d46842b39be04ecc34e5ff659 Mon Sep 17 00:00:00 2001 Message-ID: From: Michal Privoznik Date: Mon, 20 Jan 2025 17:10:24 +0100 Subject: [PATCH] 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 Reviewed-by: David Hildenbrand Reviewed-by: Boris Fiuczynski (cherry picked from commit a8ed747b9a8c5cbd07557edc66962bc26205d7fb) Resolves: https://issues.redhat.com/browse/RHEL-72976 Signed-off-by: Michal Privoznik --- src/qemu/qemu_domain.c | 3 ++- src/qemu/qemu_postparse.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 89e1b50366..b6c36d85d7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -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 diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c index 892330646a..141847b0ef 100644 --- a/src/qemu/qemu_postparse.c +++ b/src/qemu/qemu_postparse.c @@ -1806,6 +1806,7 @@ qemuDomainDefNumaAutoAdd(virDomainDef *def, if (!abiUpdate || !virDomainDefHasMemoryHotplug(def) || + qemuDomainIsS390CCW(def) || virDomainNumaGetNodeCount(def->numa) > 0) { return 0; } -- 2.49.0