* [PATCH] target/s390x: restore cpu_models for system builds
@ 2026-05-11 16:35 Eric Farman
2026-05-11 16:51 ` Cédric Le Goater
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Eric Farman @ 2026-05-11 16:35 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Cornelia Huck, Thomas Huth,
Eric Farman, Matthew Rosato, Farhan Ali, Cédric Le Goater,
Marc-André Lureau
Cc: qemu-devel, qemu-s390x
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>
---
target/s390x/meson.build | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/target/s390x/meson.build b/target/s390x/meson.build
index 44f58ac291..6adc2b896d 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',
))
@@ -38,6 +37,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')
--
2.51.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] target/s390x: restore cpu_models for system builds
2026-05-11 16:35 [PATCH] target/s390x: restore cpu_models for system builds Eric Farman
@ 2026-05-11 16:51 ` Cédric Le Goater
2026-05-11 17:48 ` Matthew Rosato
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Cédric Le Goater @ 2026-05-11 16:51 UTC (permalink / raw)
To: Eric Farman, Philippe Mathieu-Daudé, Cornelia Huck,
Thomas Huth, Matthew Rosato, Farhan Ali, Marc-André Lureau
Cc: qemu-devel, qemu-s390x
On 5/11/26 18:35, Eric Farman wrote:
> 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>
> ---
> target/s390x/meson.build | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/target/s390x/meson.build b/target/s390x/meson.build
> index 44f58ac291..6adc2b896d 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',
> ))
>
> @@ -38,6 +37,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')
Tested-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Thanks,
C.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] target/s390x: restore cpu_models for system builds
2026-05-11 16:35 [PATCH] target/s390x: restore cpu_models for system builds Eric Farman
2026-05-11 16:51 ` Cédric Le Goater
@ 2026-05-11 17:48 ` Matthew Rosato
2026-05-11 17:50 ` Philippe Mathieu-Daudé
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Matthew Rosato @ 2026-05-11 17:48 UTC (permalink / raw)
To: Eric Farman, Philippe Mathieu-Daudé, Cornelia Huck,
Thomas Huth, Farhan Ali, Cédric Le Goater,
Marc-André Lureau
Cc: qemu-devel, qemu-s390x
On 5/11/26 12:35 PM, Eric Farman wrote:
> 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>
> ---
Thanks Eric.
Besides PCI passthrough this also broke at least s390x virtio-pci due
to missing facilities; I verified both are working again after this
fix.
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
> target/s390x/meson.build | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/target/s390x/meson.build b/target/s390x/meson.build
> index 44f58ac291..6adc2b896d 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',
> ))
>
> @@ -38,6 +37,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')
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] target/s390x: restore cpu_models for system builds
2026-05-11 16:35 [PATCH] target/s390x: restore cpu_models for system builds Eric Farman
2026-05-11 16:51 ` Cédric Le Goater
2026-05-11 17:48 ` Matthew Rosato
@ 2026-05-11 17:50 ` Philippe Mathieu-Daudé
2026-05-11 18:33 ` Pierrick Bouvier
2026-05-12 16:46 ` Farhan Ali
4 siblings, 0 replies; 6+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-05-11 17:50 UTC (permalink / raw)
To: Eric Farman, Cornelia Huck, Thomas Huth, Matthew Rosato,
Farhan Ali, Cédric Le Goater, Marc-André Lureau
Cc: qemu-devel, qemu-s390x
On 11/5/26 18:35, Eric Farman wrote:
> 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>
> ---
> target/s390x/meson.build | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] target/s390x: restore cpu_models for system builds
2026-05-11 16:35 [PATCH] target/s390x: restore cpu_models for system builds Eric Farman
` (2 preceding siblings ...)
2026-05-11 17:50 ` Philippe Mathieu-Daudé
@ 2026-05-11 18:33 ` Pierrick Bouvier
2026-05-12 16:46 ` Farhan Ali
4 siblings, 0 replies; 6+ messages in thread
From: Pierrick Bouvier @ 2026-05-11 18:33 UTC (permalink / raw)
To: Eric Farman, Philippe Mathieu-Daudé, Cornelia Huck,
Thomas Huth, Matthew Rosato, Farhan Ali, Cédric Le Goater,
Marc-André Lureau
Cc: qemu-devel, qemu-s390x
On 5/11/2026 9:35 AM, Eric Farman wrote:
> 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>
> ---
> target/s390x/meson.build | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
I ended up rewriting the same patch to answer of Pull Request thread
directly :)
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] target/s390x: restore cpu_models for system builds
2026-05-11 16:35 [PATCH] target/s390x: restore cpu_models for system builds Eric Farman
` (3 preceding siblings ...)
2026-05-11 18:33 ` Pierrick Bouvier
@ 2026-05-12 16:46 ` Farhan Ali
4 siblings, 0 replies; 6+ messages in thread
From: Farhan Ali @ 2026-05-12 16:46 UTC (permalink / raw)
To: Eric Farman, Philippe Mathieu-Daudé, Cornelia Huck,
Thomas Huth, Matthew Rosato, Cédric Le Goater,
Marc-André Lureau
Cc: qemu-devel, qemu-s390x
On 5/11/2026 9:35 AM, Eric Farman wrote:
> 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>
> ---
> target/s390x/meson.build | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/target/s390x/meson.build b/target/s390x/meson.build
> index 44f58ac291..6adc2b896d 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',
> ))
>
> @@ -38,6 +37,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')
Reviewed-by: Farhan Ali<alifm@linux.ibm.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2026-05-12 16:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-05-11 16:35 [PATCH] target/s390x: restore cpu_models for system builds Eric Farman
2026-05-11 16:51 ` Cédric Le Goater
2026-05-11 17:48 ` Matthew Rosato
2026-05-11 17:50 ` Philippe Mathieu-Daudé
2026-05-11 18:33 ` Pierrick Bouvier
2026-05-12 16:46 ` Farhan Ali
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox