From: Eric Farman <[email protected]>
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 <[email protected]>
Fixes: 0b83acf2f05 ("target/s390x: Introduce common system/user meson source
set")
Signed-off-by: Eric Farman <[email protected]>
Reviewed-by: Farhan Ali <[email protected]>
Reviewed-by: Pierrick Bouvier <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Matthew Rosato <[email protected]>
Tested-by: Cédric Le Goater <[email protected]>
Reviewed-by: Cédric Le Goater <[email protected]>
Link:
https://lore.kernel.org/qemu-devel/[email protected]
Signed-off-by: Cédric Le Goater <[email protected]>
---
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
bc4459e8ed7b036e2ee5668dd338c5785a364fc0..c2cb4aca469ab49a43c22800c996cf94b09fd572
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')
--
2.54.0
