Commit f146e07b1d for qemu.org

commit f146e07b1da24b759433d0c6b838800907cd8db5
Author: Eric Farman <farman@linux.ibm.com>
Date:   Mon May 11 18:35:41 2026 +0200

    target/s390x: restore cpu_models for system builds

    Commit 0b83acf2f05 stated:

        Introduce a source set common to system / user. Start it
        with the files built in both sets: 'cpu_models_user.c'
        and 'gdbstub.c' No logical change intended.

    Except that's not true:

        git show 0b83acf2f0 | grep cpu_models
            with the files built in both sets: 'cpu_models_user.c'
        +  'cpu_models_user.c',
        -  'cpu_models_system.c',
        -  'cpu_models_user.c',

    Restore the s390x_user_ss section, move "cpu_models_user.c" back
    into it, and re-add "cpu_models_system.c" to the common_system
    section.

    Reported-by: Cédric Le Goater <clg@redhat.com>
    Fixes: 0b83acf2f05 ("target/s390x: Introduce common system/user meson source set")
    Signed-off-by: Eric Farman <farman@linux.ibm.com>
    Reviewed-by: Farhan Ali <alifm@linux.ibm.com>
    Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
    Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
    Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
    Tested-by: Cédric Le Goater <clg@redhat.com>
    Reviewed-by: Cédric Le Goater <clg@redhat.com>
    Link: https://lore.kernel.org/qemu-devel/20260511163541.192533-1-farman@linux.ibm.com
    Signed-off-by: Cédric Le Goater <clg@redhat.com>

diff --git a/target/s390x/meson.build b/target/s390x/meson.build
index bc4459e8ed..c2cb4aca46 100644
--- a/target/s390x/meson.build
+++ b/target/s390x/meson.build
@@ -22,7 +22,6 @@ gen_features_h = custom_target('gen-features.h',

 s390x_common_ss.add(gen_features_h)
 s390x_common_ss.add(files(
-  'cpu_models_user.c',
   'gdbstub.c',
 ))

@@ -39,6 +38,11 @@ s390x_common_system_ss.add(files(
   'mmu_helper.c',
   'sigp.c',
   'cpu-system.c',
+  'cpu_models_system.c',
+))
+
+s390x_user_ss.add(files(
+  'cpu_models_user.c',
 ))

 subdir('tcg')