[PATCH v2 0/4] buildsys: Stop checking for ESA/390 host

[PATCH v2 0/4] buildsys: Stop checking for ESA/390 host

[Philippe Mathieu-Daudé]

- Fix MAINTAINERS entries
- Remove s390 check in ./configure
- Replace __s390__ -> __s390x__

Philippe Mathieu-Daudé (4):
  MAINTAINERS: Fix s390x storage key/attribute device paths
  MAINTAINERS: Fix tcg/s390x/ path
  buildsys: Stop checking for ESA/390 host
  tests/tcg: Explicitly check for 64-bit z/Architecture

 MAINTAINERS                    |  6 +++---
 configure                      | 12 ++----------
 include/qemu/cacheflush.h      |  2 +-
 include/qemu/timer.h           |  2 +-
 tests/tcg/multiarch/nop_func.h |  2 +-
 block/file-posix.c             |  2 +-
 disas/disas-host.c             |  2 +-
 util/cacheflush.c              |  2 +-
 8 files changed, 11 insertions(+), 19 deletions(-)

-- 
2.53.0

[PATCH v2 1/4] MAINTAINERS: Fix s390x storage key/attribute device paths

[Philippe Mathieu-Daudé]

Fixes: 56e34834029 ("MAINTAINERS: split out s390x sections")
Reported-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 MAINTAINERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index eda1e84268a..7749fe7f9bc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2975,7 +2975,7 @@ M: Halil Pasic <pasic@linux.ibm.com>
 M: Christian Borntraeger <borntraeger@linux.ibm.com>
 R: Jason Herne <jjherne@linux.ibm.com>
 S: Supported
-F: hw/s390x/storage-keys.h
+F: include/hw/s390x/storage-keys.h
 F: hw/s390x/s390-skeys*.c
 L: qemu-s390x@nongnu.org
 
@@ -2984,7 +2984,7 @@ M: Halil Pasic <pasic@linux.ibm.com>
 M: Christian Borntraeger <borntraeger@linux.ibm.com>
 R: Jason Herne <jjherne@linux.ibm.com>
 S: Supported
-F: hw/s390x/storage-attributes.h
+F: include/hw/s390x/storage-attributes.h
 F: hw/s390x/s390-stattrib*.c
 L: qemu-s390x@nongnu.org
 
-- 
2.53.0

[PATCH v2 2/4] MAINTAINERS: Fix tcg/s390x/ path

[Philippe Mathieu-Daudé]

This folder was renamed in commit 3704993f545 ("tcg/s390x: Rename
from tcg/s390").

Reported-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 7749fe7f9bc..92b875ddfc1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4180,7 +4180,7 @@ F: disas/riscv*.[ch]
 S390 TCG target
 M: Richard Henderson <richard.henderson@linaro.org>
 S: Maintained
-F: tcg/s390/
+F: tcg/s390x/
 L: qemu-s390x@nongnu.org
 
 SPARC TCG target
-- 
2.53.0

[PATCH v2 3/4] buildsys: Stop checking for ESA/390 host

[Philippe Mathieu-Daudé]

We still build QEMU tools on 32-bit hosts (see commit
cf634dfcd8f), however no OS supported by QEMU still runs
on ESA/390 (Linux dropped support in release 4.1 in 2015).

Remove the configure check, directly checking for the 64-bit
z/Architecture.

Also per commit 3704993f545 from 2020:

  "we don't support s390, only 64-bit s390x hosts".

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 configure                 | 12 ++----------
 include/qemu/cacheflush.h |  2 +-
 include/qemu/timer.h      |  2 +-
 block/file-posix.c        |  2 +-
 disas/disas-host.c        |  2 +-
 util/cacheflush.c         |  2 +-
 6 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/configure b/configure
index eea90306728..513ef7a153d 100755
--- a/configure
+++ b/configure
@@ -401,12 +401,8 @@ elif check_define _ARCH_PPC64 ; then
   fi
 elif check_define __mips64 ; then
   cpu="mips64"
-elif check_define __s390__ ; then
-  if check_define __s390x__ ; then
-    cpu="s390x"
-  else
-    cpu="s390"
-  fi
+elif check_define __s390x__ ; then
+  cpu="s390x"
 elif check_define __riscv && check_define _LP64 ; then
   cpu="riscv64"
 elif check_define __aarch64__ ; then
@@ -469,10 +465,6 @@ case "$cpu" in
     linux_arch=riscv
     ;;
 
-  s390)
-    linux_arch=s390
-    CPU_CFLAGS="-m31"
-    ;;
   s390x)
     host_arch=s390x
     linux_arch=s390
diff --git a/include/qemu/cacheflush.h b/include/qemu/cacheflush.h
index 8c64b878145..0618966ddde 100644
--- a/include/qemu/cacheflush.h
+++ b/include/qemu/cacheflush.h
@@ -19,7 +19,7 @@
  * mappings of the same physical page(s).
  */
 
-#if defined(__x86_64__) || defined(__s390__)
+#if defined(__x86_64__) || defined(__s390x__)
 
 static inline void flush_idcache_range(uintptr_t rx, uintptr_t rw, size_t len)
 {
diff --git a/include/qemu/timer.h b/include/qemu/timer.h
index b931181f53d..fc021f8f966 100644
--- a/include/qemu/timer.h
+++ b/include/qemu/timer.h
@@ -889,7 +889,7 @@ static inline int64_t cpu_get_host_ticks(void)
     return val;
 }
 
-#elif defined(__s390__)
+#elif defined(__s390x__)
 
 static inline int64_t cpu_get_host_ticks(void)
 {
diff --git a/block/file-posix.c b/block/file-posix.c
index e49b13d6abb..5019ddade9b 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -79,7 +79,7 @@
 #include <linux/hdreg.h>
 #include <linux/magic.h>
 #include <scsi/sg.h>
-#ifdef __s390__
+#ifdef __s390x__
 #include <asm/dasd.h>
 #endif
 #ifndef FS_NOCOW_FL
diff --git a/disas/disas-host.c b/disas/disas-host.c
index 7cf432938e0..d41235250a0 100644
--- a/disas/disas-host.c
+++ b/disas/disas-host.c
@@ -74,7 +74,7 @@ static void initialize_debug_host(CPUDebug *s)
     s->info.print_insn = print_insn_little_mips;
 #elif defined(__m68k__)
     s->info.print_insn = print_insn_m68k;
-#elif defined(__s390__)
+#elif defined(__s390x__)
     s->info.cap_arch = CS_ARCH_SYSZ;
     s->info.cap_insn_unit = 2;
     s->info.cap_insn_split = 6;
diff --git a/util/cacheflush.c b/util/cacheflush.c
index c043c5f881a..77440ddb478 100644
--- a/util/cacheflush.c
+++ b/util/cacheflush.c
@@ -223,7 +223,7 @@ static void __attribute__((constructor)) init_cache_info(void)
  * Architecture (+ OS) specific cache flushing mechanisms.
  */
 
-#if defined(__x86_64__) || defined(__s390__)
+#if defined(__x86_64__) || defined(__s390x__)
 
 /* Caches are coherent and do not require flushing; symbol inline. */
 
-- 
2.53.0

[PATCH v2 4/4] tests/tcg: Explicitly check for 64-bit z/Architecture

[Philippe Mathieu-Daudé]

We do not support the 32-bit ESA/390 target, only the
64-bit z/Architecture.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 tests/tcg/multiarch/nop_func.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tcg/multiarch/nop_func.h b/tests/tcg/multiarch/nop_func.h
index f714d210000..26d3a76eb62 100644
--- a/tests/tcg/multiarch/nop_func.h
+++ b/tests/tcg/multiarch/nop_func.h
@@ -15,7 +15,7 @@ static const char nop_func[] = {
     0x1e, 0xff, 0x2f, 0xe1,     /* bx lr */
 #elif defined(__riscv)
     0x67, 0x80, 0x00, 0x00,     /* ret */
-#elif defined(__s390__)
+#elif defined(__s390x__)
     0x07, 0xfe,                 /* br %r14 */
 #elif defined(__i386__) || defined(__x86_64__)
     0xc3,                       /* ret */
-- 
2.53.0

Re: [PATCH v2 2/4] MAINTAINERS: Fix tcg/s390x/ path

[Richard Henderson]

On 5/19/26 10:12, Philippe Mathieu-Daudé wrote:
> This folder was renamed in commit 3704993f545 ("tcg/s390x: Rename
> from tcg/s390").
> 
> Reported-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   MAINTAINERS | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 7749fe7f9bc..92b875ddfc1 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -4180,7 +4180,7 @@ F: disas/riscv*.[ch]
>   S390 TCG target
>   M: Richard Henderson <richard.henderson@linaro.org>
>   S: Maintained
> -F: tcg/s390/
> +F: tcg/s390x/
>   L: qemu-s390x@nongnu.org
>   
>   SPARC TCG target

Re: [PATCH v2 3/4] buildsys: Stop checking for ESA/390 host

[Richard Henderson]

On 5/19/26 10:12, Philippe Mathieu-Daudé wrote:
> We still build QEMU tools on 32-bit hosts (see commit
> cf634dfcd8f), however no OS supported by QEMU still runs
> on ESA/390 (Linux dropped support in release 4.1 in 2015).
> 
> Remove the configure check, directly checking for the 64-bit
> z/Architecture.
> 
> Also per commit 3704993f545 from 2020:
> 
>    "we don't support s390, only 64-bit s390x hosts".
> 
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> ---
>   configure                 | 12 ++----------
>   include/qemu/cacheflush.h |  2 +-
>   include/qemu/timer.h      |  2 +-
>   block/file-posix.c        |  2 +-
>   disas/disas-host.c        |  2 +-
>   util/cacheflush.c         |  2 +-
>   6 files changed, 7 insertions(+), 15 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Re: [PATCH v2 4/4] tests/tcg: Explicitly check for 64-bit z/Architecture

[Richard Henderson]

On 5/19/26 10:12, Philippe Mathieu-Daudé wrote:
> We do not support the 32-bit ESA/390 target, only the
> 64-bit z/Architecture.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   tests/tcg/multiarch/nop_func.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/tcg/multiarch/nop_func.h b/tests/tcg/multiarch/nop_func.h
> index f714d210000..26d3a76eb62 100644
> --- a/tests/tcg/multiarch/nop_func.h
> +++ b/tests/tcg/multiarch/nop_func.h
> @@ -15,7 +15,7 @@ static const char nop_func[] = {
>       0x1e, 0xff, 0x2f, 0xe1,     /* bx lr */
>   #elif defined(__riscv)
>       0x67, 0x80, 0x00, 0x00,     /* ret */
> -#elif defined(__s390__)
> +#elif defined(__s390x__)
>       0x07, 0xfe,                 /* br %r14 */
>   #elif defined(__i386__) || defined(__x86_64__)
>       0xc3,                       /* ret */

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~

Re: [PATCH v2 1/4] MAINTAINERS: Fix s390x storage key/attribute device paths

[Thomas Huth]

On 19/05/2026 19.12, Philippe Mathieu-Daudé wrote:
> Fixes: 56e34834029 ("MAINTAINERS: split out s390x sections")
> Reported-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   MAINTAINERS | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index eda1e84268a..7749fe7f9bc 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2975,7 +2975,7 @@ M: Halil Pasic <pasic@linux.ibm.com>
>   M: Christian Borntraeger <borntraeger@linux.ibm.com>
>   R: Jason Herne <jjherne@linux.ibm.com>
>   S: Supported
> -F: hw/s390x/storage-keys.h
> +F: include/hw/s390x/storage-keys.h
>   F: hw/s390x/s390-skeys*.c
>   L: qemu-s390x@nongnu.org
>   
> @@ -2984,7 +2984,7 @@ M: Halil Pasic <pasic@linux.ibm.com>
>   M: Christian Borntraeger <borntraeger@linux.ibm.com>
>   R: Jason Herne <jjherne@linux.ibm.com>
>   S: Supported
> -F: hw/s390x/storage-attributes.h
> +F: include/hw/s390x/storage-attributes.h
>   F: hw/s390x/s390-stattrib*.c
>   L: qemu-s390x@nongnu.org

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v2 2/4] MAINTAINERS: Fix tcg/s390x/ path

[Thomas Huth]

On 19/05/2026 19.12, Philippe Mathieu-Daudé wrote:
> This folder was renamed in commit 3704993f545 ("tcg/s390x: Rename
> from tcg/s390").
> 
> Reported-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   MAINTAINERS | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 7749fe7f9bc..92b875ddfc1 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -4180,7 +4180,7 @@ F: disas/riscv*.[ch]
>   S390 TCG target
>   M: Richard Henderson <richard.henderson@linaro.org>
>   S: Maintained
> -F: tcg/s390/
> +F: tcg/s390x/
>   L: qemu-s390x@nongnu.org

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v2 3/4] buildsys: Stop checking for ESA/390 host

[Thomas Huth]

On 19/05/2026 19.12, Philippe Mathieu-Daudé wrote:
> We still build QEMU tools on 32-bit hosts (see commit
> cf634dfcd8f), however no OS supported by QEMU still runs
> on ESA/390 (Linux dropped support in release 4.1 in 2015).

Technically, the 64-bit Linux kernels on IBM Z still supported 32-bit 
userspace until recently:

  https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8e0b986c59c67e08ada646249f834655a9e6da16

... which got released with Linux v6.19. So there theoretically could still 
be Linux distros around that use a 64-bit kernel with a 32-bit userspace. 
Practically, I haven't seens such a setup in ages, so I think it is safe to 
go ahead with this patch.

Thus:
Reviewed-by: Thomas Huth <thuth@redhat.com>


> Remove the configure check, directly checking for the 64-bit
> z/Architecture.
> 
> Also per commit 3704993f545 from 2020:
> 
>    "we don't support s390, only 64-bit s390x hosts".
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   configure                 | 12 ++----------
>   include/qemu/cacheflush.h |  2 +-
>   include/qemu/timer.h      |  2 +-
>   block/file-posix.c        |  2 +-
>   disas/disas-host.c        |  2 +-
>   util/cacheflush.c         |  2 +-
>   6 files changed, 7 insertions(+), 15 deletions(-)
> 
> diff --git a/configure b/configure
> index eea90306728..513ef7a153d 100755
> --- a/configure
> +++ b/configure
> @@ -401,12 +401,8 @@ elif check_define _ARCH_PPC64 ; then
>     fi
>   elif check_define __mips64 ; then
>     cpu="mips64"
> -elif check_define __s390__ ; then
> -  if check_define __s390x__ ; then
> -    cpu="s390x"
> -  else
> -    cpu="s390"
> -  fi
> +elif check_define __s390x__ ; then
> +  cpu="s390x"
>   elif check_define __riscv && check_define _LP64 ; then
>     cpu="riscv64"
>   elif check_define __aarch64__ ; then
> @@ -469,10 +465,6 @@ case "$cpu" in
>       linux_arch=riscv
>       ;;
>   
> -  s390)
> -    linux_arch=s390
> -    CPU_CFLAGS="-m31"
> -    ;;
>     s390x)
>       host_arch=s390x
>       linux_arch=s390
> diff --git a/include/qemu/cacheflush.h b/include/qemu/cacheflush.h
> index 8c64b878145..0618966ddde 100644
> --- a/include/qemu/cacheflush.h
> +++ b/include/qemu/cacheflush.h
> @@ -19,7 +19,7 @@
>    * mappings of the same physical page(s).
>    */
>   
> -#if defined(__x86_64__) || defined(__s390__)
> +#if defined(__x86_64__) || defined(__s390x__)
>   
>   static inline void flush_idcache_range(uintptr_t rx, uintptr_t rw, size_t len)
>   {
> diff --git a/include/qemu/timer.h b/include/qemu/timer.h
> index b931181f53d..fc021f8f966 100644
> --- a/include/qemu/timer.h
> +++ b/include/qemu/timer.h
> @@ -889,7 +889,7 @@ static inline int64_t cpu_get_host_ticks(void)
>       return val;
>   }
>   
> -#elif defined(__s390__)
> +#elif defined(__s390x__)
>   
>   static inline int64_t cpu_get_host_ticks(void)
>   {
> diff --git a/block/file-posix.c b/block/file-posix.c
> index e49b13d6abb..5019ddade9b 100644
> --- a/block/file-posix.c
> +++ b/block/file-posix.c
> @@ -79,7 +79,7 @@
>   #include <linux/hdreg.h>
>   #include <linux/magic.h>
>   #include <scsi/sg.h>
> -#ifdef __s390__
> +#ifdef __s390x__
>   #include <asm/dasd.h>
>   #endif
>   #ifndef FS_NOCOW_FL
> diff --git a/disas/disas-host.c b/disas/disas-host.c
> index 7cf432938e0..d41235250a0 100644
> --- a/disas/disas-host.c
> +++ b/disas/disas-host.c
> @@ -74,7 +74,7 @@ static void initialize_debug_host(CPUDebug *s)
>       s->info.print_insn = print_insn_little_mips;
>   #elif defined(__m68k__)
>       s->info.print_insn = print_insn_m68k;
> -#elif defined(__s390__)
> +#elif defined(__s390x__)
>       s->info.cap_arch = CS_ARCH_SYSZ;
>       s->info.cap_insn_unit = 2;
>       s->info.cap_insn_split = 6;
> diff --git a/util/cacheflush.c b/util/cacheflush.c
> index c043c5f881a..77440ddb478 100644
> --- a/util/cacheflush.c
> +++ b/util/cacheflush.c
> @@ -223,7 +223,7 @@ static void __attribute__((constructor)) init_cache_info(void)
>    * Architecture (+ OS) specific cache flushing mechanisms.
>    */
>   
> -#if defined(__x86_64__) || defined(__s390__)
> +#if defined(__x86_64__) || defined(__s390x__)
>   
>   /* Caches are coherent and do not require flushing; symbol inline. */
>   

Re: [PATCH v2 4/4] tests/tcg: Explicitly check for 64-bit z/Architecture

[Thomas Huth]

On 19/05/2026 19.12, Philippe Mathieu-Daudé wrote:
> We do not support the 32-bit ESA/390 target, only the
> 64-bit z/Architecture.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   tests/tcg/multiarch/nop_func.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/tcg/multiarch/nop_func.h b/tests/tcg/multiarch/nop_func.h
> index f714d210000..26d3a76eb62 100644
> --- a/tests/tcg/multiarch/nop_func.h
> +++ b/tests/tcg/multiarch/nop_func.h
> @@ -15,7 +15,7 @@ static const char nop_func[] = {
>       0x1e, 0xff, 0x2f, 0xe1,     /* bx lr */
>   #elif defined(__riscv)
>       0x67, 0x80, 0x00, 0x00,     /* ret */
> -#elif defined(__s390__)
> +#elif defined(__s390x__)
>       0x07, 0xfe,                 /* br %r14 */
>   #elif defined(__i386__) || defined(__x86_64__)
>       0xc3,                       /* ret */

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v2 0/4] buildsys: Stop checking for ESA/390 host

[Cornelia Huck]

On Tue, May 19 2026, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:

> - Fix MAINTAINERS entries
> - Remove s390 check in ./configure
> - Replace __s390__ -> __s390x__
>
> Philippe Mathieu-Daudé (4):
>   MAINTAINERS: Fix s390x storage key/attribute device paths
>   MAINTAINERS: Fix tcg/s390x/ path
>   buildsys: Stop checking for ESA/390 host
>   tests/tcg: Explicitly check for 64-bit z/Architecture
>
>  MAINTAINERS                    |  6 +++---
>  configure                      | 12 ++----------
>  include/qemu/cacheflush.h      |  2 +-
>  include/qemu/timer.h           |  2 +-
>  tests/tcg/multiarch/nop_func.h |  2 +-
>  block/file-posix.c             |  2 +-
>  disas/disas-host.c             |  2 +-
>  util/cacheflush.c              |  2 +-
>  8 files changed, 11 insertions(+), 19 deletions(-)
>

Thanks, queued patches 1-3 (3 with context tweak) to s390-next.