From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 20 Jan 2025 16:10:24 +0000 (+0100)
Subject: qemu: Do NOT autoadd NUMA node for s390
X-Git-Tag: v11.1.0-rc1~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8ed747b9a8c5cbd07557edc66962bc26205d7fb;p=thirdparty%2Flibvirt.git

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>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index c7d7ac26ce..6554b992f0 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 1f9077982a..20ee333e0d 100644
--- a/src/qemu/qemu_postparse.c
+++ b/src/qemu/qemu_postparse.c
@@ -1805,6 +1805,7 @@ qemuDomainDefNumaAutoAdd(virDomainDef *def,
 
     if (!abiUpdate ||
         !virDomainDefHasMemoryHotplug(def) ||
+        qemuDomainIsS390CCW(def) ||
         virDomainNumaGetNodeCount(def->numa) > 0) {
         return 0;
     }