[v1] Enable virtio-mem-ccw

[PATCH 1/8] qemu: Do NOT autoadd NUMA node for s390

Posted by Michal Privoznik 7 months, 2 weeks ago

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>
---
 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 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;
     }
-- 
2.45.2

Re: [PATCH 1/8] qemu: Do NOT autoadd NUMA node for s390

Posted by Boris Fiuczynski 7 months, 2 weeks ago

Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>

On 1/24/25 13:21, Michal Privoznik wrote:
> 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>
> ---
>   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 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;
>       }


-- 
Mit freundlichen Grüßen/Kind regards
    Boris Fiuczynski

IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Wolfgang Wendt
Geschäftsführung: David Faller
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294

Re: [PATCH 1/8] qemu: Do NOT autoadd NUMA node for s390

Posted by David Hildenbrand 7 months, 2 weeks ago

On 24.01.25 13:21, Michal Privoznik wrote:
> 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>

-- 
Cheers,

David / dhildenb