Re: [PATCH v3 1/5] accel/tcg: Move SoftMMU specific units to softmmu_specific_ss[]

[Philippe Mathieu-Daudé]

On 3/5/24 14:34, Philippe Mathieu-Daudé wrote:

Currently these files are only used in system emulation,
but could eventually be used by user emulation. Use the
"softmmu_specific_ss" to express they are related to
SoftMMU.

Signed-off-by: Philippe Mathieu-Daudé 
---
  accel/tcg/meson.build | 7 +--
  1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build
index aef80de967..84826f043a 100644
--- a/accel/tcg/meson.build
+++ b/accel/tcg/meson.build
@@ -16,12 +16,13 @@ tcg_specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_false: 
files('user-exec-stub.
  if get_option('plugins')
tcg_specific_ss.add(files('plugin-gen.c'))
  endif
-specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss)
  
-specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(

+softmmu_specific_ss = ss.source_set()
+softmmu_specific_ss.add(files(
'cputlb.c',
'watchpoint.c',
  ))
+tcg_specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: softmmu_specific_ss)


Should be .add_all() here.


  system_ss.add(when: ['CONFIG_TCG'], if_true: files(
'icount-common.c',
@@ -34,3 +35,5 @@ tcg_module_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], 
if_true: files(
'tcg-accel-ops-icount.c',
'tcg-accel-ops-rr.c',
  ))
+
+specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss)

[PATCH v3 1/5] accel/tcg: Move SoftMMU specific units to softmmu_specific_ss[]

[Philippe Mathieu-Daudé]

Currently these files are only used in system emulation,
but could eventually be used by user emulation. Use the
"softmmu_specific_ss" to express they are related to
SoftMMU.

Signed-off-by: Philippe Mathieu-Daudé 
---
 accel/tcg/meson.build | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build
index aef80de967..84826f043a 100644
--- a/accel/tcg/meson.build
+++ b/accel/tcg/meson.build
@@ -16,12 +16,13 @@ tcg_specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_false: 
files('user-exec-stub.
 if get_option('plugins')
   tcg_specific_ss.add(files('plugin-gen.c'))
 endif
-specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss)
 
-specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
+softmmu_specific_ss = ss.source_set()
+softmmu_specific_ss.add(files(
   'cputlb.c',
   'watchpoint.c',
 ))
+tcg_specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: softmmu_specific_ss)
 
 system_ss.add(when: ['CONFIG_TCG'], if_true: files(
   'icount-common.c',
@@ -34,3 +35,5 @@ tcg_module_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], 
if_true: files(
   'tcg-accel-ops-icount.c',
   'tcg-accel-ops-rr.c',
 ))
+
+specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss)
-- 
2.41.0