Series comparison

 [PULL 00/16] tcg patch queue
-The following changes since commit 3e08b2b9cb64bff2b73fa9128c0e49bfcde0dd40:
+The following changes since commit 48ab886d3da4f3ab94f79f6c0f8b4535b446bbfd:
-  Merge remote-tracking branch 'remotes/philmd-gitlab/tags/edk2-next-20200121' into staging (2020-01-21 15:29:25 +0000)
+  Merge tag 'pull-target-arm-20230619' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2023-06-19 16:32:25 +0200)
 are available in the Git repository at:
-  https://github.com/rth7680/qemu.git tags/pull-tcg-20200121
+  https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20230620
-for you to fetch changes up to 75fa376cdab5e5db2c7fdd107358e16f95503ac6:
+for you to fetch changes up to d7ee93e24359703debf4137f4cc632563aa4e8d1:
-  scripts/git.orderfile: Display decodetree before C source (2020-01-21 15:26:09 -1000)
+  cputlb: Restrict SavedIOTLB to system emulation (2023-06-20 10:02:14 +0200)
 ----------------------------------------------------------------
-Remove another limit to NB_MMU_MODES.
+tcg: Define _CALL_AIX for clang on ppc64
-Fix compilation using uclibc.
+accel/tcg: Build fix for macos catalina
-Fix defaulting of -accel parameters.
+accel/tcg: Handle MO_ATOM_WITHIN16 in do_st16_leN
-Tidy cputlb basic routines.
+accel/tcg: Restrict SavedIOTLB to system emulation
-Adjust git.orderfile for decodetree.
+accel/tcg: Use generic 'helper-proto-common.h' header
 plugins: Remove unused 'exec/helper-proto.h' header
 *: Check for CONFIG_USER_ONLY instead of CONFIG_SOFTMMU
 ----------------------------------------------------------------
-Carlos Santos (1):
+Philippe Mathieu-Daudé (13):
-      util/cacheinfo: fix crash when compiling with uClibc
+      target/i386: Simplify i386_tr_init_disas_context()
       target/tricore: Remove pointless CONFIG_SOFTMMU guard
       target/m68k: Check for USER_ONLY definition instead of SOFTMMU one
       target/ppc: Check for USER_ONLY definition instead of SOFTMMU one
       hw/core/cpu: Check for USER_ONLY definition instead of SOFTMMU one
       accel/tcg: Check for USER_ONLY definition instead of SOFTMMU one
       meson: Alias CONFIG_SOFTMMU -> CONFIG_SYSTEM_ONLY
       meson: Replace CONFIG_SOFTMMU -> CONFIG_SYSTEM_ONLY
       meson: Replace softmmu_ss -> system_ss
       plugins: Remove unused 'exec/helper-proto.h' header
       accel/tcg/cpu-exec: Use generic 'helper-proto-common.h' header
       exec/cpu-defs: Check for SOFTMMU instead of !USER_ONLY
       cputlb: Restrict SavedIOTLB to system emulation
-Philippe Mathieu-Daudé (1):
+Richard Henderson (3):
-      scripts/git.orderfile: Display decodetree before C source
+      host/include/x86_64: Use __m128i for "x" constraints
       accel/tcg: Handle MO_ATOM_WITHIN16 in do_st16_leN
       tcg/ppc: Define _CALL_AIX for clang on ppc64(be)
-Richard Henderson (14):
+ docs/devel/build-system.rst                      |  14 +--
-      cputlb: Handle NB_MMU_MODES > TARGET_PAGE_BITS_MIN
+ meson.build                                      |  15 +--
-      vl: Remove unused variable in configure_accelerators
+ accel/tcg/internal.h                             |   6 +-
-      vl: Reduce scope of variables in configure_accelerators
+ host/include/x86_64/host/atomic128-ldst.h        |  25 ++--
-      vl: Remove useless test in configure_accelerators
+ host/include/x86_64/host/load-extract-al16-al8.h |   8 +-
-      vl: Only choose enabled accelerators in configure_accelerators
+ include/exec/cpu-defs.h                          |  12 +-
-      cputlb: Merge tlb_table_flush_by_mmuidx into tlb_flush_one_mmuidx_locked
+ include/hw/core/cpu.h                            |  10 +-
-      cputlb: Make tlb_n_entries private to cputlb.c
+ include/hw/core/tcg-cpu-ops.h                    | 102 ++++++++--------
-      cputlb: Pass CPUTLBDescFast to tlb_n_entries and sizeof_tlb
+ target/m68k/helper.h                             |   2 +-
-      cputlb: Hoist tlb portions in tlb_mmu_resize_locked
+ accel/tcg/cpu-exec.c                             |   6 +-
-      cputlb: Hoist tlb portions in tlb_flush_one_mmuidx_locked
+ accel/tcg/cputlb.c                               |   1 +
-      cputlb: Split out tlb_mmu_flush_locked
+ plugins/core.c                                   |   1 -
-      cputlb: Partially merge tlb_dyn_init into tlb_init
+ target/i386/tcg/translate.c                      |   3 -
-      cputlb: Initialize tlbs as flushed
+ target/m68k/cpu.c                                |  14 +--
-      cputlb: Hoist timestamp outside of loops over tlbs
+ target/m68k/helper.c                             |   4 +-
  target/m68k/translate.c                          |  28 ++---
  target/ppc/cpu_init.c                            |  20 +--
  target/ppc/helper_regs.c                         |   6 +-
  target/tricore/helper.c                          |   2 -
  tcg/ppc/tcg-target.c.inc                         |  23 ++--
  accel/meson.build                                |   4 +-
  accel/qtest/meson.build                          |   2 +-
  accel/stubs/meson.build                          |   2 +-
  accel/tcg/meson.build                            |   6 +-
  audio/meson.build                                |   8 +-
  backends/meson.build                             |  20 +--
  backends/tpm/meson.build                         |   8 +-
  block/meson.build                                |   6 +-
  block/monitor/meson.build                        |   2 +-
  chardev/meson.build                              |   2 +-
  disas/meson.build                                |   2 +-
  dump/meson.build                                 |   4 +-
  ebpf/meson.build                                 |   2 +-
  fsdev/meson.build                                |   4 +-
  gdbstub/meson.build                              |  10 +-
  hw/9pfs/meson.build                              |   2 +-
  hw/acpi/meson.build                              |  10 +-
  hw/adc/meson.build                               |  10 +-
  hw/arm/meson.build                               |   8 +-
  hw/audio/meson.build                             |  28 ++---
  hw/block/meson.build                             |  28 ++---
  hw/char/meson.build                              |  70 +++++------
  hw/core/meson.build                              |  22 ++--
  hw/cpu/meson.build                               |   6 +-
  hw/cxl/meson.build                               |   4 +-
  hw/display/meson.build                           |  76 ++++++------
  hw/dma/meson.build                               |  32 ++---
  hw/gpio/meson.build                              |  26 ++--
  hw/i2c/meson.build                               |   2 +-
  hw/i386/kvm/meson.build                          |   2 +-
  hw/ide/meson.build                               |  28 ++---
  hw/input/meson.build                             |  32 ++---
  hw/intc/meson.build                              |  44 +++----
  hw/ipack/meson.build                             |   2 +-
  hw/ipmi/meson.build                              |   2 +-
  hw/isa/meson.build                               |  18 +--
  hw/mem/meson.build                               |   8 +-
  hw/misc/macio/meson.build                        |   2 +-
  hw/misc/meson.build                              | 148 +++++++++++------------
  hw/net/can/meson.build                           |  16 +--
  hw/net/meson.build                               |  96 +++++++--------
  hw/nubus/meson.build                             |   2 +-
  hw/nvme/meson.build                              |   2 +-
  hw/nvram/meson.build                             |  26 ++--
  hw/pci-bridge/meson.build                        |   4 +-
  hw/pci-host/meson.build                          |   2 +-
  hw/pci/meson.build                               |   8 +-
  hw/pcmcia/meson.build                            |   4 +-
  hw/rdma/meson.build                              |   2 +-
  hw/remote/meson.build                            |   2 +-
  hw/rtc/meson.build                               |  28 ++---
  hw/scsi/meson.build                              |   2 +-
  hw/sd/meson.build                                |  24 ++--
  hw/sensor/meson.build                            |  18 +--
  hw/smbios/meson.build                            |   6 +-
  hw/ssi/meson.build                               |  26 ++--
  hw/timer/meson.build                             |  74 ++++++------
  hw/tpm/meson.build                               |  14 +--
  hw/usb/meson.build                               |  74 ++++++------
  hw/virtio/meson.build                            |  12 +-
  hw/watchdog/meson.build                          |  18 +--
  hw/xen/meson.build                               |   4 +-
  migration/meson.build                            |  12 +-
  monitor/meson.build                              |   6 +-
  net/can/meson.build                              |   2 +-
  net/meson.build                                  |  38 +++---
  qapi/meson.build                                 |   2 +-
  qom/meson.build                                  |   2 +-
  replay/meson.build                               |   2 +-
  semihosting/meson.build                          |   2 +-
  softmmu/meson.build                              |  12 +-
  stats/meson.build                                |   2 +-
  target/alpha/meson.build                         |   6 +-
  target/arm/hvf/meson.build                       |   2 +-
  target/arm/meson.build                           |   6 +-
  target/arm/tcg/meson.build                       |   2 +-
  target/avr/meson.build                           |   6 +-
  target/cris/meson.build                          |   6 +-
  target/hppa/meson.build                          |   6 +-
  target/i386/hax/meson.build                      |   6 +-
  target/i386/hvf/meson.build                      |   2 +-
  target/i386/kvm/meson.build                      |   4 +-
  target/i386/meson.build                          |   8 +-
  target/i386/nvmm/meson.build                     |   4 +-
  target/i386/tcg/sysemu/meson.build               |   2 +-
  target/i386/whpx/meson.build                     |   2 +-
  target/loongarch/meson.build                     |   6 +-
  target/m68k/meson.build                          |   6 +-
  target/microblaze/meson.build                    |   6 +-
  target/mips/meson.build                          |   4 +-
  target/mips/sysemu/meson.build                   |   2 +-
  target/mips/tcg/sysemu/meson.build               |   2 +-
  target/nios2/meson.build                         |   6 +-
  target/openrisc/meson.build                      |   6 +-
  target/ppc/meson.build                           |  10 +-
  target/riscv/meson.build                         |   6 +-
  target/s390x/kvm/meson.build                     |   2 +-
  target/s390x/meson.build                         |   6 +-
  target/sh4/meson.build                           |   6 +-
  target/sparc/meson.build                         |   6 +-
  target/tricore/meson.build                       |   4 +-
  target/xtensa/meson.build                        |   6 +-
  tcg/meson.build                                  |   2 +-
  trace/meson.build                                |   2 +-
  ui/meson.build                                   |  30 ++---
 files changed, 864 insertions(+), 854 deletions(-)
- include/exec/cpu_ldst.h |   5 -
- accel/tcg/cputlb.c      | 287 +++++++++++++++++++++++++++++++++---------------
- util/cacheinfo.c        |  10 +-
- vl.c                    |  27 +++--
- scripts/git.orderfile   |   3 +
-files changed, 223 insertions(+), 109 deletions(-)

-[PULL 10/16] cputlb: Hoist tlb portions in tlb_mmu_resize_locked
+[PULL 01/16] host/include/x86_64: Use __m128i for "x" constraints
-No functional change, but the smaller expressions make
+The macOS catalina compiler produces an error for __int128_t
-the code easier to read.
+as the type for allocation with SSE inline asm constraint.
 Create a new X86Int128Union type and use the vector type for
 all SSE register inputs and outputs.
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+Tested-by: Peter Maydell <peter.maydell@linaro.org>
 Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
 Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- accel/tcg/cputlb.c | 35 +++++++++++++++++------------------
+ host/include/x86_64/host/atomic128-ldst.h     | 25 ++++++++++++-------
-file changed, 17 insertions(+), 18 deletions(-)
+ .../x86_64/host/load-extract-al16-al8.h       |  8 +++---
 files changed, 20 insertions(+), 13 deletions(-)
-diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
+diff --git a/host/include/x86_64/host/atomic128-ldst.h b/host/include/x86_64/host/atomic128-ldst.h
 index XXXXXXX..XXXXXXX 100644
---- a/accel/tcg/cputlb.c
+--- a/host/include/x86_64/host/atomic128-ldst.h
-+++ b/accel/tcg/cputlb.c
++++ b/host/include/x86_64/host/atomic128-ldst.h
-@@ -XXX,XX +XXX,XX @@ static void tlb_dyn_init(CPUArchState *env)
+@@ -XXX,XX +XXX,XX @@
   * atomic primitive is meant to provide.
   */
 -#ifndef AARCH64_ATOMIC128_LDST_H
 -#define AARCH64_ATOMIC128_LDST_H
 +#ifndef X86_64_ATOMIC128_LDST_H
 +#define X86_64_ATOMIC128_LDST_H
  #ifdef CONFIG_INT128_TYPE
  #include "host/cpuinfo.h"
  #include "tcg/debug-assert.h"
 +#include <immintrin.h>
 +
 +typedef union {
 +    __m128i v;
 +    __int128_t i;
 +    Int128 s;
 +} X86Int128Union;
  /*
   * Through clang 16, with -mcx16, __atomic_load_n is incorrectly
@@ -XXX,XX +XXX,XX @@
  static inline Int128 atomic16_read_ro(const Int128 *ptr)
  {
 -    Int128Alias r;
 +    X86Int128Union r;
      tcg_debug_assert(HAVE_ATOMIC128_RO);
 -    asm("vmovdqa %1, %0" : "=x" (r.i) : "m" (*ptr));
 +    asm("vmovdqa %1, %0" : "=x" (r.v) : "m" (*ptr));
      return r.s;
  }
@@ -XXX,XX +XXX,XX @@ static inline Int128 atomic16_read_ro(const Int128 *ptr)
  static inline Int128 atomic16_read_rw(Int128 *ptr)
  {
      __int128_t *ptr_align = __builtin_assume_aligned(ptr, 16);
 -    Int128Alias r;
 +    X86Int128Union r;
      if (HAVE_ATOMIC128_RO) {
 -        asm("vmovdqa %1, %0" : "=x" (r.i) : "m" (*ptr_align));
 +        asm("vmovdqa %1, %0" : "=x" (r.v) : "m" (*ptr_align));
      } else {
          r.i = __sync_val_compare_and_swap_16(ptr_align, 0, 0);
      }
@@ -XXX,XX +XXX,XX @@ static inline Int128 atomic16_read_rw(Int128 *ptr)
  static inline void atomic16_set(Int128 *ptr, Int128 val)
  {
      __int128_t *ptr_align = __builtin_assume_aligned(ptr, 16);
 -    Int128Alias new = { .s = val };
 +    X86Int128Union new = { .s = val };
      if (HAVE_ATOMIC128_RO) {
 -        asm("vmovdqa %1, %0" : "=m"(*ptr_align) : "x" (new.i));
 +        asm("vmovdqa %1, %0" : "=m"(*ptr_align) : "x" (new.v));
      } else {
          __int128_t old;
          do {
@@ -XXX,XX +XXX,XX @@ static inline void atomic16_set(Int128 *ptr, Int128 val)
  #include "host/include/generic/host/atomic128-ldst.h"
  #endif
 -#endif /* AARCH64_ATOMIC128_LDST_H */
 +#endif /* X86_64_ATOMIC128_LDST_H */
 diff --git a/host/include/x86_64/host/load-extract-al16-al8.h b/host/include/x86_64/host/load-extract-al16-al8.h
 index XXXXXXX..XXXXXXX 100644
 --- a/host/include/x86_64/host/load-extract-al16-al8.h
 +++ b/host/include/x86_64/host/load-extract-al16-al8.h
@@ -XXX,XX +XXX,XX @@
  #define X86_64_LOAD_EXTRACT_AL16_AL8_H
  #ifdef CONFIG_INT128_TYPE
 -#include "host/cpuinfo.h"
 +#include "host/atomic128-ldst.h"
  /**
-  * tlb_mmu_resize_locked() - perform TLB resize bookkeeping; resize if necessary
+  * load_atom_extract_al16_or_al8:
-- * @env: CPU that owns the TLB
+@@ -XXX,XX +XXX,XX @@ load_atom_extract_al16_or_al8(void *pv, int s)
-- * @mmu_idx: MMU index of the TLB
+     uintptr_t pi = (uintptr_t)pv;
-+ * @desc: The CPUTLBDesc portion of the TLB
+     __int128_t *ptr_align = (__int128_t *)(pi & ~7);
-+ * @fast: The CPUTLBDescFast portion of the same TLB
+     int shr = (pi & 7) * 8;
-  *
+-    Int128Alias r;
-  * Called with tlb_lock_held.
++    X86Int128Union r;
-  *
-@@ -XXX,XX +XXX,XX @@ static void tlb_dyn_init(CPUArchState *env)
+     /*
-  * high), since otherwise we are likely to have a significant amount of
+      * ptr_align % 16 is now only 0 or 8.
-  * conflict misses.
+@@ -XXX,XX +XXX,XX @@ load_atom_extract_al16_or_al8(void *pv, int s)
-  */
+      * when ptr_align % 16 == 0 for 16-byte atomicity.
--static void tlb_mmu_resize_locked(CPUArchState *env, int mmu_idx)
+      */
-+static void tlb_mmu_resize_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)
+     if ((cpuinfo & CPUINFO_ATOMIC_VMOVDQU) || (pi & 8)) {
- {
+-        asm("vmovdqu %1, %0" : "=x" (r.i) : "m" (*ptr_align));
--    CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];
++        asm("vmovdqu %1, %0" : "=x" (r.v) : "m" (*ptr_align));
--    size_t old_size = tlb_n_entries(&env_tlb(env)->f[mmu_idx]);
+     } else {
-+    size_t old_size = tlb_n_entries(fast);
+-        asm("vmovdqa %1, %0" : "=x" (r.i) : "m" (*ptr_align));
-     size_t rate;
++        asm("vmovdqa %1, %0" : "=x" (r.v) : "m" (*ptr_align));
      size_t new_size = old_size;
      int64_t now = get_clock_realtime();
@@ -XXX,XX +XXX,XX @@ static void tlb_mmu_resize_locked(CPUArchState *env, int mmu_idx)
          return;
      }
+     return int128_getlo(int128_urshift(r.s, shr));
 -    g_free(env_tlb(env)->f[mmu_idx].table);
 -    g_free(env_tlb(env)->d[mmu_idx].iotlb);
 +    g_free(fast->table);
 +    g_free(desc->iotlb);
      tlb_window_reset(desc, now, 0);
      /* desc->n_used_entries is cleared by the caller */
 -    env_tlb(env)->f[mmu_idx].mask = (new_size - 1) << CPU_TLB_ENTRY_BITS;
 -    env_tlb(env)->f[mmu_idx].table = g_try_new(CPUTLBEntry, new_size);
 -    env_tlb(env)->d[mmu_idx].iotlb = g_try_new(CPUIOTLBEntry, new_size);
 +    fast->mask = (new_size - 1) << CPU_TLB_ENTRY_BITS;
 +    fast->table = g_try_new(CPUTLBEntry, new_size);
 +    desc->iotlb = g_try_new(CPUIOTLBEntry, new_size);
 +
      /*
       * If the allocations fail, try smaller sizes. We just freed some
       * memory, so going back to half of new_size has a good chance of working.
@@ -XXX,XX +XXX,XX @@ static void tlb_mmu_resize_locked(CPUArchState *env, int mmu_idx)
       * allocations to fail though, so we progressively reduce the allocation
       * size, aborting if we cannot even allocate the smallest TLB we support.
       */
 -    while (env_tlb(env)->f[mmu_idx].table == NULL ||
 -           env_tlb(env)->d[mmu_idx].iotlb == NULL) {
 +    while (fast->table == NULL || desc->iotlb == NULL) {
          if (new_size == (1 << CPU_TLB_DYN_MIN_BITS)) {
              error_report("%s: %s", __func__, strerror(errno));
              abort();
          }
          new_size = MAX(new_size >> 1, 1 << CPU_TLB_DYN_MIN_BITS);
 -        env_tlb(env)->f[mmu_idx].mask = (new_size - 1) << CPU_TLB_ENTRY_BITS;
 +        fast->mask = (new_size - 1) << CPU_TLB_ENTRY_BITS;
 -        g_free(env_tlb(env)->f[mmu_idx].table);
 -        g_free(env_tlb(env)->d[mmu_idx].iotlb);
 -        env_tlb(env)->f[mmu_idx].table = g_try_new(CPUTLBEntry, new_size);
 -        env_tlb(env)->d[mmu_idx].iotlb = g_try_new(CPUIOTLBEntry, new_size);
 +        g_free(fast->table);
 +        g_free(desc->iotlb);
 +        fast->table = g_try_new(CPUTLBEntry, new_size);
 +        desc->iotlb = g_try_new(CPUIOTLBEntry, new_size);
      }
  }
- static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
- {
--    tlb_mmu_resize_locked(env, mmu_idx);
-+    tlb_mmu_resize_locked(&env_tlb(env)->d[mmu_idx], &env_tlb(env)->f[mmu_idx]);
-     env_tlb(env)->d[mmu_idx].n_used_entries = 0;
-     env_tlb(env)->d[mmu_idx].large_page_addr = -1;
-     env_tlb(env)->d[mmu_idx].large_page_mask = -1;
 --
-.20.1
+.34.1

-[PULL 01/16] cputlb: Handle NB_MMU_MODES > TARGET_PAGE_BITS_MIN
+[PULL 02/16] accel/tcg: Handle MO_ATOM_WITHIN16 in do_st16_leN
-In target/arm we will shortly have "too many" mmu_idx.
+Otherwise we hit the default assert not reached.
-The current minimum barrier is caused by the way in which
+Handle it as MO_ATOM_NONE, because of size and misalignment.
-tlb_flush_page_by_mmuidx is coded.
+We already handle this correctly in do_ld16_beN.
 We can remove this limitation by allocating memory for
 consumption by the worker.  Let us assume that this is
 the unlikely case, as will be the case for the majority
 of targets which have so far satisfied the BUILD_BUG_ON,
 and only allocate memory when necessary.
 Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- accel/tcg/cputlb.c | 167 +++++++++++++++++++++++++++++++++++----------
+ accel/tcg/cputlb.c | 1 +
-file changed, 132 insertions(+), 35 deletions(-)
+file changed, 1 insertion(+)
 diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
 index XXXXXXX..XXXXXXX 100644
 --- a/accel/tcg/cputlb.c
 +++ b/accel/tcg/cputlb.c
-@@ -XXX,XX +XXX,XX @@ static void tlb_flush_page_locked(CPUArchState *env, int midx,
+@@ -XXX,XX +XXX,XX @@ static uint64_t do_st16_leN(CPUArchState *env, MMULookupPageData *p,
-     }
+          * and so neither is atomic.
- }
+          */
+     case MO_ATOM_IFALIGN:
--/* As we are going to hijack the bottom bits of the page address for a
++    case MO_ATOM_WITHIN16:
-- * mmuidx bit mask we need to fail to build if we can't do that
+     case MO_ATOM_NONE:
-+/**
+         stq_le_p(p->haddr, int128_getlo(val_le));
-+ * tlb_flush_page_by_mmuidx_async_0:
+         return store_bytes_leN(p->haddr + 8, p->size - 8,
 + * @cpu: cpu on which to flush
 + * @addr: page of virtual address to flush
 + * @idxmap: set of mmu_idx to flush
 + *
 + * Helper for tlb_flush_page_by_mmuidx and friends, flush one page
 + * at @addr from the tlbs indicated by @idxmap from @cpu.
   */
 -QEMU_BUILD_BUG_ON(NB_MMU_MODES > TARGET_PAGE_BITS_MIN);
 -
 -static void tlb_flush_page_by_mmuidx_async_work(CPUState *cpu,
 -                                                run_on_cpu_data data)
 +static void tlb_flush_page_by_mmuidx_async_0(CPUState *cpu,
 +                                             target_ulong addr,
 +                                             uint16_t idxmap)
  {
      CPUArchState *env = cpu->env_ptr;
 -    target_ulong addr_and_mmuidx = (target_ulong) data.target_ptr;
 -    target_ulong addr = addr_and_mmuidx & TARGET_PAGE_MASK;
 -    unsigned long mmu_idx_bitmap = addr_and_mmuidx & ALL_MMUIDX_BITS;
      int mmu_idx;
      assert_cpu_is_self(cpu);
 -    tlb_debug("page addr:" TARGET_FMT_lx " mmu_map:0x%lx\n",
 -              addr, mmu_idx_bitmap);
 +    tlb_debug("page addr:" TARGET_FMT_lx " mmu_map:0x%x\n", addr, idxmap);
      qemu_spin_lock(&env_tlb(env)->c.lock);
      for (mmu_idx = 0; mmu_idx < NB_MMU_MODES; mmu_idx++) {
 -        if (test_bit(mmu_idx, &mmu_idx_bitmap)) {
 +        if ((idxmap >> mmu_idx) & 1) {
              tlb_flush_page_locked(env, mmu_idx, addr);
          }
      }
@@ -XXX,XX +XXX,XX @@ static void tlb_flush_page_by_mmuidx_async_work(CPUState *cpu,
      tb_flush_jmp_cache(cpu, addr);
  }
 +/**
 + * tlb_flush_page_by_mmuidx_async_1:
 + * @cpu: cpu on which to flush
 + * @data: encoded addr + idxmap
 + *
 + * Helper for tlb_flush_page_by_mmuidx and friends, called through
 + * async_run_on_cpu.  The idxmap parameter is encoded in the page
 + * offset of the target_ptr field.  This limits the set of mmu_idx
 + * that can be passed via this method.
 + */
 +static void tlb_flush_page_by_mmuidx_async_1(CPUState *cpu,
 +                                             run_on_cpu_data data)
 +{
 +    target_ulong addr_and_idxmap = (target_ulong) data.target_ptr;
 +    target_ulong addr = addr_and_idxmap & TARGET_PAGE_MASK;
 +    uint16_t idxmap = addr_and_idxmap & ~TARGET_PAGE_MASK;
 +
 +    tlb_flush_page_by_mmuidx_async_0(cpu, addr, idxmap);
 +}
 +
 +typedef struct {
 +    target_ulong addr;
 +    uint16_t idxmap;
 +} TLBFlushPageByMMUIdxData;
 +
 +/**
 + * tlb_flush_page_by_mmuidx_async_2:
 + * @cpu: cpu on which to flush
 + * @data: allocated addr + idxmap
 + *
 + * Helper for tlb_flush_page_by_mmuidx and friends, called through
 + * async_run_on_cpu.  The addr+idxmap parameters are stored in a
 + * TLBFlushPageByMMUIdxData structure that has been allocated
 + * specifically for this helper.  Free the structure when done.
 + */
 +static void tlb_flush_page_by_mmuidx_async_2(CPUState *cpu,
 +                                             run_on_cpu_data data)
 +{
 +    TLBFlushPageByMMUIdxData *d = data.host_ptr;
 +
 +    tlb_flush_page_by_mmuidx_async_0(cpu, d->addr, d->idxmap);
 +    g_free(d);
 +}
 +
  void tlb_flush_page_by_mmuidx(CPUState *cpu, target_ulong addr, uint16_t idxmap)
  {
 -    target_ulong addr_and_mmu_idx;
 -
      tlb_debug("addr: "TARGET_FMT_lx" mmu_idx:%" PRIx16 "\n", addr, idxmap);
      /* This should already be page aligned */
 -    addr_and_mmu_idx = addr & TARGET_PAGE_MASK;
 -    addr_and_mmu_idx |= idxmap;
 +    addr &= TARGET_PAGE_MASK;
 -    if (!qemu_cpu_is_self(cpu)) {
 -        async_run_on_cpu(cpu, tlb_flush_page_by_mmuidx_async_work,
 -                         RUN_ON_CPU_TARGET_PTR(addr_and_mmu_idx));
 +    if (qemu_cpu_is_self(cpu)) {
 +        tlb_flush_page_by_mmuidx_async_0(cpu, addr, idxmap);
 +    } else if (idxmap < TARGET_PAGE_SIZE) {
 +        /*
 +         * Most targets have only a few mmu_idx.  In the case where
 +         * we can stuff idxmap into the low TARGET_PAGE_BITS, avoid
 +         * allocating memory for this operation.
 +         */
 +        async_run_on_cpu(cpu, tlb_flush_page_by_mmuidx_async_1,
 +                         RUN_ON_CPU_TARGET_PTR(addr | idxmap));
      } else {
 -        tlb_flush_page_by_mmuidx_async_work(
 -            cpu, RUN_ON_CPU_TARGET_PTR(addr_and_mmu_idx));
 +        TLBFlushPageByMMUIdxData *d = g_new(TLBFlushPageByMMUIdxData, 1);
 +
 +        /* Otherwise allocate a structure, freed by the worker.  */
 +        d->addr = addr;
 +        d->idxmap = idxmap;
 +        async_run_on_cpu(cpu, tlb_flush_page_by_mmuidx_async_2,
 +                         RUN_ON_CPU_HOST_PTR(d));
      }
  }
@@ -XXX,XX +XXX,XX @@ void tlb_flush_page(CPUState *cpu, target_ulong addr)
  void tlb_flush_page_by_mmuidx_all_cpus(CPUState *src_cpu, target_ulong addr,
                                         uint16_t idxmap)
  {
 -    const run_on_cpu_func fn = tlb_flush_page_by_mmuidx_async_work;
 -    target_ulong addr_and_mmu_idx;
 -
      tlb_debug("addr: "TARGET_FMT_lx" mmu_idx:%"PRIx16"\n", addr, idxmap);
      /* This should already be page aligned */
 -    addr_and_mmu_idx = addr & TARGET_PAGE_MASK;
 -    addr_and_mmu_idx |= idxmap;
 +    addr &= TARGET_PAGE_MASK;
 -    flush_all_helper(src_cpu, fn, RUN_ON_CPU_TARGET_PTR(addr_and_mmu_idx));
 -    fn(src_cpu, RUN_ON_CPU_TARGET_PTR(addr_and_mmu_idx));
 +    /*
 +     * Allocate memory to hold addr+idxmap only when needed.
 +     * See tlb_flush_page_by_mmuidx for details.
 +     */
 +    if (idxmap < TARGET_PAGE_SIZE) {
 +        flush_all_helper(src_cpu, tlb_flush_page_by_mmuidx_async_1,
 +                         RUN_ON_CPU_TARGET_PTR(addr | idxmap));
 +    } else {
 +        CPUState *dst_cpu;
 +
 +        /* Allocate a separate data block for each destination cpu.  */
 +        CPU_FOREACH(dst_cpu) {
 +            if (dst_cpu != src_cpu) {
 +                TLBFlushPageByMMUIdxData *d
 +                    = g_new(TLBFlushPageByMMUIdxData, 1);
 +
 +                d->addr = addr;
 +                d->idxmap = idxmap;
 +                async_run_on_cpu(dst_cpu, tlb_flush_page_by_mmuidx_async_2,
 +                                 RUN_ON_CPU_HOST_PTR(d));
 +            }
 +        }
 +    }
 +
 +    tlb_flush_page_by_mmuidx_async_0(src_cpu, addr, idxmap);
  }
  void tlb_flush_page_all_cpus(CPUState *src, target_ulong addr)
@@ -XXX,XX +XXX,XX @@ void tlb_flush_page_by_mmuidx_all_cpus_synced(CPUState *src_cpu,
                                                target_ulong addr,
                                                uint16_t idxmap)
  {
 -    const run_on_cpu_func fn = tlb_flush_page_by_mmuidx_async_work;
 -    target_ulong addr_and_mmu_idx;
 -
      tlb_debug("addr: "TARGET_FMT_lx" mmu_idx:%"PRIx16"\n", addr, idxmap);
      /* This should already be page aligned */
 -    addr_and_mmu_idx = addr & TARGET_PAGE_MASK;
 -    addr_and_mmu_idx |= idxmap;
 +    addr &= TARGET_PAGE_MASK;
 -    flush_all_helper(src_cpu, fn, RUN_ON_CPU_TARGET_PTR(addr_and_mmu_idx));
 -    async_safe_run_on_cpu(src_cpu, fn, RUN_ON_CPU_TARGET_PTR(addr_and_mmu_idx));
 +    /*
 +     * Allocate memory to hold addr+idxmap only when needed.
 +     * See tlb_flush_page_by_mmuidx for details.
 +     */
 +    if (idxmap < TARGET_PAGE_SIZE) {
 +        flush_all_helper(src_cpu, tlb_flush_page_by_mmuidx_async_1,
 +                         RUN_ON_CPU_TARGET_PTR(addr | idxmap));
 +        async_safe_run_on_cpu(src_cpu, tlb_flush_page_by_mmuidx_async_1,
 +                              RUN_ON_CPU_TARGET_PTR(addr | idxmap));
 +    } else {
 +        CPUState *dst_cpu;
 +        TLBFlushPageByMMUIdxData *d;
 +
 +        /* Allocate a separate data block for each destination cpu.  */
 +        CPU_FOREACH(dst_cpu) {
 +            if (dst_cpu != src_cpu) {
 +                d = g_new(TLBFlushPageByMMUIdxData, 1);
 +                d->addr = addr;
 +                d->idxmap = idxmap;
 +                async_run_on_cpu(dst_cpu, tlb_flush_page_by_mmuidx_async_2,
 +                                 RUN_ON_CPU_HOST_PTR(d));
 +            }
 +        }
 +
 +        d = g_new(TLBFlushPageByMMUIdxData, 1);
 +        d->addr = addr;
 +        d->idxmap = idxmap;
 +        async_safe_run_on_cpu(src_cpu, tlb_flush_page_by_mmuidx_async_2,
 +                              RUN_ON_CPU_HOST_PTR(d));
 +    }
  }
  void tlb_flush_page_all_cpus_synced(CPUState *src, target_ulong addr)
 --
-.20.1
+.34.1

-[PULL 14/16] cputlb: Initialize tlbs as flushed
+[PULL 03/16] tcg/ppc: Define _CALL_AIX for clang on ppc64(be)
-There's little point in leaving these data structures half initialized,
+Restructure the ifdef ladder, separating 64-bit from 32-bit,
-and relying on a flush to be done during reset.
+and ensure _CALL_AIX is set for ELF v1.  Fixes the build for
 ppc64 big-endian host with clang.
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
 Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- accel/tcg/cputlb.c | 5 +++--
+ tcg/ppc/tcg-target.c.inc | 23 ++++++++++++++++-------
-file changed, 3 insertions(+), 2 deletions(-)
+file changed, 16 insertions(+), 7 deletions(-)
-diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
+diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc
 index XXXXXXX..XXXXXXX 100644
---- a/accel/tcg/cputlb.c
+--- a/tcg/ppc/tcg-target.c.inc
-+++ b/accel/tcg/cputlb.c
++++ b/tcg/ppc/tcg-target.c.inc
-@@ -XXX,XX +XXX,XX @@ static void tlb_mmu_init(CPUTLBDesc *desc, CPUTLBDescFast *fast, int64_t now)
+@@ -XXX,XX +XXX,XX @@
-     fast->mask = (n_entries - 1) << CPU_TLB_ENTRY_BITS;
+ /*
-     fast->table = g_new(CPUTLBEntry, n_entries);
+  * Standardize on the _CALL_FOO symbols used by GCC:
-     desc->iotlb = g_new(CPUIOTLBEntry, n_entries);
+  * Apple XCode does not define _CALL_DARWIN.
-+    tlb_mmu_flush_locked(desc, fast);
+- * Clang defines _CALL_ELF (64-bit) but not _CALL_SYSV (32-bit).
- }
++ * Clang defines _CALL_ELF (64-bit) but not _CALL_SYSV or _CALL_AIX.
+  */
- static inline void tlb_n_used_entries_inc(CPUArchState *env, uintptr_t mmu_idx)
+-#if !defined(_CALL_SYSV) && \
-@@ -XXX,XX +XXX,XX @@ void tlb_init(CPUState *cpu)
+-    !defined(_CALL_DARWIN) && \
+-    !defined(_CALL_AIX) && \
-     qemu_spin_init(&env_tlb(env)->c.lock);
+-    !defined(_CALL_ELF)
+-# if defined(__APPLE__)
--    /* Ensure that cpu_reset performs a full flush.  */
++#if TCG_TARGET_REG_BITS == 64
--    env_tlb(env)->c.dirty = ALL_MMUIDX_BITS;
++# ifdef _CALL_AIX
-+    /* All tlbs are initialized flushed. */
++    /* ok */
-+    env_tlb(env)->c.dirty = 0;
++# elif defined(_CALL_ELF) && _CALL_ELF == 1
++#  define _CALL_AIX
-     for (i = 0; i < NB_MMU_MODES; i++) {
++# elif defined(_CALL_ELF) && _CALL_ELF == 2
-         tlb_mmu_init(&env_tlb(env)->d[i], &env_tlb(env)->f[i], now);
++    /* ok */
 +# else
 +#  error "Unknown ABI"
 +# endif
 +#else
 +# if defined(_CALL_SYSV) || defined(_CALL_DARWIN)
 +    /* ok */
 +# elif defined(__APPLE__)
  #  define _CALL_DARWIN
 -# elif defined(__ELF__) && TCG_TARGET_REG_BITS == 32
 +# elif defined(__ELF__)
  #  define _CALL_SYSV
  # else
  #  error "Unknown ABI"
 --
-.20.1
+.34.1

-[PULL 16/16] scripts/git.orderfile: Display decodetree before C source
+[PULL 04/16] target/i386: Simplify i386_tr_init_disas_context()
-From: Philippe Mathieu-Daudé <philmd@redhat.com>
+From: Philippe Mathieu-Daudé <philmd@linaro.org>
-To avoid scrolling each instruction when reviewing tcg
+Since cpu_mmu_index() is well-defined for user-only,
-helpers written for the decodetree script, display the
+we can remove the surrounding #ifdef'ry entirely.
 .decode files (similar to header declarations) before
 the C source (implementation of previous declarations).
-Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Suggested-by: Richard Henderson <richard.henderson@linaro.org>
-Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
+Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-Id: <20191230082856.30556-1-philmd@redhat.com>
+Message-Id: <20230613133347.82210-2-philmd@linaro.org>
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- scripts/git.orderfile | 3 +++
+ target/i386/tcg/translate.c | 3 ---
-file changed, 3 insertions(+)
+file changed, 3 deletions(-)
-diff --git a/scripts/git.orderfile b/scripts/git.orderfile
+diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
 index XXXXXXX..XXXXXXX 100644
---- a/scripts/git.orderfile
+--- a/target/i386/tcg/translate.c
-+++ b/scripts/git.orderfile
++++ b/target/i386/tcg/translate.c
-@@ -XXX,XX +XXX,XX @@ qga/*.json
+@@ -XXX,XX +XXX,XX @@ static void i386_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cpu)
- # headers
+     dc->cc_op_dirty = false;
- *.h
+     dc->popl_esp_hack = 0;
+     /* select memory access functions */
-+# decoding tree specification
+-    dc->mem_index = 0;
-+*.decode
+-#ifdef CONFIG_SOFTMMU
-+
+     dc->mem_index = cpu_mmu_index(env, false);
- # code
+-#endif
- *.c
+     dc->cpuid_features = env->features[FEAT_1_EDX];
      dc->cpuid_ext_features = env->features[FEAT_1_ECX];
      dc->cpuid_ext2_features = env->features[FEAT_8000_0001_EDX];
 --
-.20.1
+.34.1

-[PULL 13/16] cputlb: Partially merge tlb_dyn_init into tlb_init
+[PULL 05/16] target/tricore: Remove pointless CONFIG_SOFTMMU guard
-Merge into the only caller, but at the same time split
+From: Philippe Mathieu-Daudé <philmd@linaro.org>
 out tlb_mmu_init to initialize a single tlb entry.
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+We don't build any user emulation target for Tricore,
-Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
+only the system emulation. No need to check for it as
-Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+it is always defined.
 Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
 Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
 Reviewed-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
 Message-Id: <20230613133347.82210-3-philmd@linaro.org>
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- accel/tcg/cputlb.c | 33 ++++++++++++++++-----------------
+ target/tricore/helper.c | 2 --
-file changed, 16 insertions(+), 17 deletions(-)
+file changed, 2 deletions(-)
-diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
+diff --git a/target/tricore/helper.c b/target/tricore/helper.c
 index XXXXXXX..XXXXXXX 100644
---- a/accel/tcg/cputlb.c
+--- a/target/tricore/helper.c
-+++ b/accel/tcg/cputlb.c
++++ b/target/tricore/helper.c
-@@ -XXX,XX +XXX,XX @@ static void tlb_window_reset(CPUTLBDesc *desc, int64_t ns,
+@@ -XXX,XX +XXX,XX @@ enum {
-     desc->window_max_entries = max_entries;
+     TLBRET_MATCH = 0
  };
 -#if defined(CONFIG_SOFTMMU)
  static int get_physical_address(CPUTriCoreState *env, hwaddr *physical,
                                  int *prot, target_ulong address,
                                  MMUAccessType access_type, int mmu_idx)
@@ -XXX,XX +XXX,XX @@ hwaddr tricore_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)
      }
      return phys_addr;
  }
+-#endif
--static void tlb_dyn_init(CPUArchState *env)
--{
+ /* TODO: Add exeption support*/
--    int i;
+ static void raise_mmu_exception(CPUTriCoreState *env, target_ulong address,
 -
 -    for (i = 0; i < NB_MMU_MODES; i++) {
 -        CPUTLBDesc *desc = &env_tlb(env)->d[i];
 -        size_t n_entries = 1 << CPU_TLB_DYN_DEFAULT_BITS;
 -
 -        tlb_window_reset(desc, get_clock_realtime(), 0);
 -        desc->n_used_entries = 0;
 -        env_tlb(env)->f[i].mask = (n_entries - 1) << CPU_TLB_ENTRY_BITS;
 -        env_tlb(env)->f[i].table = g_new(CPUTLBEntry, n_entries);
 -        env_tlb(env)->d[i].iotlb = g_new(CPUIOTLBEntry, n_entries);
 -    }
 -}
 -
  /**
   * tlb_mmu_resize_locked() - perform TLB resize bookkeeping; resize if necessary
   * @desc: The CPUTLBDesc portion of the TLB
@@ -XXX,XX +XXX,XX @@ static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
      tlb_mmu_flush_locked(desc, fast);
  }
 +static void tlb_mmu_init(CPUTLBDesc *desc, CPUTLBDescFast *fast, int64_t now)
 +{
 +    size_t n_entries = 1 << CPU_TLB_DYN_DEFAULT_BITS;
 +
 +    tlb_window_reset(desc, now, 0);
 +    desc->n_used_entries = 0;
 +    fast->mask = (n_entries - 1) << CPU_TLB_ENTRY_BITS;
 +    fast->table = g_new(CPUTLBEntry, n_entries);
 +    desc->iotlb = g_new(CPUIOTLBEntry, n_entries);
 +}
 +
  static inline void tlb_n_used_entries_inc(CPUArchState *env, uintptr_t mmu_idx)
  {
      env_tlb(env)->d[mmu_idx].n_used_entries++;
@@ -XXX,XX +XXX,XX @@ static inline void tlb_n_used_entries_dec(CPUArchState *env, uintptr_t mmu_idx)
  void tlb_init(CPUState *cpu)
  {
      CPUArchState *env = cpu->env_ptr;
 +    int64_t now = get_clock_realtime();
 +    int i;
      qemu_spin_init(&env_tlb(env)->c.lock);
      /* Ensure that cpu_reset performs a full flush.  */
      env_tlb(env)->c.dirty = ALL_MMUIDX_BITS;
 -    tlb_dyn_init(env);
 +    for (i = 0; i < NB_MMU_MODES; i++) {
 +        tlb_mmu_init(&env_tlb(env)->d[i], &env_tlb(env)->f[i], now);
 +    }
  }
  /* flush_all_helper: run fn across all cpus
 --
-.20.1
+.34.1

-[PULL 15/16] cputlb: Hoist timestamp outside of loops over tlbs
+[PULL 06/16] target/m68k: Check for USER_ONLY definition instead of SOFTMMU one
-Do not call get_clock_realtime() in tlb_mmu_resize_locked,
+From: Philippe Mathieu-Daudé <philmd@linaro.org>
-but hoist outside of any loop over a set of tlbs.  This is
-only two (indirect) callers, tlb_flush_by_mmuidx_async_work
+Since we *might* have user emulation with softmmu,
-and tlb_flush_page_locked, so not onerous.
+replace the system emulation check by !user emulation one.
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+Invert some if() ladders for clarity.
-Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
 Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
 Message-Id: <20230613133347.82210-4-philmd@linaro.org>
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- accel/tcg/cputlb.c | 14 ++++++++------
+ target/m68k/helper.h    |  2 +-
-file changed, 8 insertions(+), 6 deletions(-)
+ target/m68k/cpu.c       | 14 ++++++--------
+ target/m68k/helper.c    |  4 ++--
-diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
+ target/m68k/translate.c | 28 ++++++++++++++--------------
-index XXXXXXX..XXXXXXX 100644
+files changed, 23 insertions(+), 25 deletions(-)
---- a/accel/tcg/cputlb.c
-+++ b/accel/tcg/cputlb.c
+diff --git a/target/m68k/helper.h b/target/m68k/helper.h
-@@ -XXX,XX +XXX,XX @@ static void tlb_window_reset(CPUTLBDesc *desc, int64_t ns,
+index XXXXXXX..XXXXXXX 100644
-  * high), since otherwise we are likely to have a significant amount of
+--- a/target/m68k/helper.h
-  * conflict misses.
++++ b/target/m68k/helper.h
-  */
+@@ -XXX,XX +XXX,XX @@ DEF_HELPER_FLAGS_4(bfffo_mem, TCG_CALL_NO_WG, i64, env, i32, s32, i32)
--static void tlb_mmu_resize_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)
+ DEF_HELPER_3(chk, void, env, s32, s32)
-+static void tlb_mmu_resize_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast,
+ DEF_HELPER_4(chk2, void, env, s32, s32, s32)
-+                                  int64_t now)
- {
+-#if defined(CONFIG_SOFTMMU)
-     size_t old_size = tlb_n_entries(fast);
++#if !defined(CONFIG_USER_ONLY)
-     size_t rate;
+ DEF_HELPER_3(ptest, void, env, i32, i32)
-     size_t new_size = old_size;
+ DEF_HELPER_3(pflush, void, env, i32, i32)
--    int64_t now = get_clock_realtime();
+ DEF_HELPER_FLAGS_1(reset, TCG_CALL_NO_RWG, void, env)
-     int64_t window_len_ms = 100;
+diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c
-     int64_t window_len_ns = window_len_ms * 1000 * 1000;
+index XXXXXXX..XXXXXXX 100644
-     bool window_expired = now > desc->window_begin_ns + window_len_ns;
+--- a/target/m68k/cpu.c
-@@ -XXX,XX +XXX,XX @@ static void tlb_mmu_flush_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)
++++ b/target/m68k/cpu.c
-     memset(desc->vtable, -1, sizeof(desc->vtable));
+@@ -XXX,XX +XXX,XX @@ static void m68k_cpu_reset_hold(Object *obj)
  }
 -static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
 +static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx,
 +                                        int64_t now)
  {
      CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];
      CPUTLBDescFast *fast = &env_tlb(env)->f[mmu_idx];
 -    tlb_mmu_resize_locked(desc, fast);
 +    tlb_mmu_resize_locked(desc, fast, now);
      tlb_mmu_flush_locked(desc, fast);
  }
@@ -XXX,XX +XXX,XX @@ static void tlb_flush_by_mmuidx_async_work(CPUState *cpu, run_on_cpu_data data)
      CPUArchState *env = cpu->env_ptr;
      uint16_t asked = data.host_int;
      uint16_t all_dirty, work, to_clean;
 +    int64_t now = get_clock_realtime();
      assert_cpu_is_self(cpu);
@@ -XXX,XX +XXX,XX @@ static void tlb_flush_by_mmuidx_async_work(CPUState *cpu, run_on_cpu_data data)
      for (work = to_clean; work != 0; work &= work - 1) {
          int mmu_idx = ctz32(work);
 -        tlb_flush_one_mmuidx_locked(env, mmu_idx);
 +        tlb_flush_one_mmuidx_locked(env, mmu_idx, now);
      }
-     qemu_spin_unlock(&env_tlb(env)->c.lock);
+     memset(env, 0, offsetof(CPUM68KState, end_reset_fields));
-@@ -XXX,XX +XXX,XX @@ static void tlb_flush_page_locked(CPUArchState *env, int midx,
+-#ifdef CONFIG_SOFTMMU
-         tlb_debug("forcing full flush midx %d ("
+-    cpu_m68k_set_sr(env, SR_S | SR_I);
-                   TARGET_FMT_lx "/" TARGET_FMT_lx ")\n",
+-#else
-                   midx, lp_addr, lp_mask);
++#ifdef CONFIG_USER_ONLY
--        tlb_flush_one_mmuidx_locked(env, midx);
+     cpu_m68k_set_sr(env, 0);
-+        tlb_flush_one_mmuidx_locked(env, midx, get_clock_realtime());
++#else
-     } else {
++    cpu_m68k_set_sr(env, SR_S | SR_I);
-         if (tlb_flush_entry_locked(tlb_entry(env, midx, page), page)) {
+ #endif
-             tlb_n_used_entries_dec(env, midx);
+     for (i = 0; i < 8; i++) {
          env->fregs[i].d = nan;
@@ -XXX,XX +XXX,XX @@ static void m68k_cpu_initfn(Object *obj)
      cpu_set_cpustate_pointers(cpu);
  }
 -#if defined(CONFIG_SOFTMMU)
 +#if !defined(CONFIG_USER_ONLY)
  static bool fpu_needed(void *opaque)
  {
      M68kCPU *s = opaque;
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_m68k_cpu = {
          NULL
      },
  };
 -#endif
 -#ifndef CONFIG_USER_ONLY
  #include "hw/core/sysemu-cpu-ops.h"
  static const struct SysemuCPUOps m68k_sysemu_ops = {
      .get_phys_page_debug = m68k_cpu_get_phys_page_debug,
  };
 -#endif
 +#endif /* !CONFIG_USER_ONLY */
  #include "hw/core/tcg-cpu-ops.h"
@@ -XXX,XX +XXX,XX @@ static void m68k_cpu_class_init(ObjectClass *c, void *data)
      cc->get_pc = m68k_cpu_get_pc;
      cc->gdb_read_register = m68k_cpu_gdb_read_register;
      cc->gdb_write_register = m68k_cpu_gdb_write_register;
 -#if defined(CONFIG_SOFTMMU)
 +#if !defined(CONFIG_USER_ONLY)
      dc->vmsd = &vmstate_m68k_cpu;
      cc->sysemu_ops = &m68k_sysemu_ops;
  #endif
 diff --git a/target/m68k/helper.c b/target/m68k/helper.c
 index XXXXXXX..XXXXXXX 100644
 --- a/target/m68k/helper.c
 +++ b/target/m68k/helper.c
@@ -XXX,XX +XXX,XX @@ void HELPER(set_mac_extu)(CPUM68KState *env, uint32_t val, uint32_t acc)
      env->macc[acc + 1] = res;
  }
 -#if defined(CONFIG_SOFTMMU)
 +#if !defined(CONFIG_USER_ONLY)
  void HELPER(ptest)(CPUM68KState *env, uint32_t addr, uint32_t is_read)
  {
      hwaddr physical;
@@ -XXX,XX +XXX,XX @@ void HELPER(reset)(CPUM68KState *env)
  {
      /* FIXME: reset all except CPU */
  }
 -#endif
 +#endif /* !CONFIG_USER_ONLY */
 diff --git a/target/m68k/translate.c b/target/m68k/translate.c
 index XXXXXXX..XXXXXXX 100644
 --- a/target/m68k/translate.c
 +++ b/target/m68k/translate.c
@@ -XXX,XX +XXX,XX @@ DISAS_INSN(swap)
  DISAS_INSN(bkpt)
  {
 -#if defined(CONFIG_SOFTMMU)
 -    gen_exception(s, s->base.pc_next, EXCP_ILLEGAL);
 -#else
 +#if defined(CONFIG_USER_ONLY)
      gen_exception(s, s->base.pc_next, EXCP_DEBUG);
 +#else
 +    gen_exception(s, s->base.pc_next, EXCP_ILLEGAL);
  #endif
  }
@@ -XXX,XX +XXX,XX @@ DISAS_INSN(unlk)
      tcg_gen_addi_i32(QREG_SP, src, 4);
  }
 -#if defined(CONFIG_SOFTMMU)
 +#if !defined(CONFIG_USER_ONLY)
  DISAS_INSN(reset)
  {
      if (IS_USER(s)) {
@@ -XXX,XX +XXX,XX @@ DISAS_INSN(move_from_sr)
      DEST_EA(env, insn, OS_WORD, sr, NULL);
  }
 -#if defined(CONFIG_SOFTMMU)
 +#if !defined(CONFIG_USER_ONLY)
  DISAS_INSN(moves)
  {
      int opsize;
@@ -XXX,XX +XXX,XX @@ DISAS_INSN(cinv)
      /* Invalidate cache line.  Implement as no-op.  */
  }
 -#if defined(CONFIG_SOFTMMU)
 +#if !defined(CONFIG_USER_ONLY)
  DISAS_INSN(pflush)
  {
      TCGv opmode;
@@ -XXX,XX +XXX,XX @@ DISAS_INSN(ftrapcc)
      do_trapcc(s, &c);
  }
 -#if defined(CONFIG_SOFTMMU)
 +#if !defined(CONFIG_USER_ONLY)
  DISAS_INSN(frestore)
  {
      TCGv addr;
@@ -XXX,XX +XXX,XX @@ void register_m68k_insns (CPUM68KState *env)
      BASE(bitop_im,  08c0, ffc0);
      INSN(arith_im,  0a80, fff8, CF_ISA_A);
      INSN(arith_im,  0a00, ff00, M68K);
 -#if defined(CONFIG_SOFTMMU)
 +#if !defined(CONFIG_USER_ONLY)
      INSN(moves,     0e00, ff00, M68K);
  #endif
      INSN(cas,       0ac0, ffc0, CAS);
@@ -XXX,XX +XXX,XX @@ void register_m68k_insns (CPUM68KState *env)
      BASE(move_to_ccr, 44c0, ffc0);
      INSN(not,       4680, fff8, CF_ISA_A);
      INSN(not,       4600, ff00, M68K);
 -#if defined(CONFIG_SOFTMMU)
 +#if !defined(CONFIG_USER_ONLY)
      BASE(move_to_sr, 46c0, ffc0);
  #endif
      INSN(nbcd,      4800, ffc0, M68K);
@@ -XXX,XX +XXX,XX @@ void register_m68k_insns (CPUM68KState *env)
      BASE(tst,       4a00, ff00);
      INSN(tas,       4ac0, ffc0, CF_ISA_B);
      INSN(tas,       4ac0, ffc0, M68K);
 -#if defined(CONFIG_SOFTMMU)
 +#if !defined(CONFIG_USER_ONLY)
      INSN(halt,      4ac8, ffff, CF_ISA_A);
      INSN(halt,      4ac8, ffff, M68K);
  #endif
@@ -XXX,XX +XXX,XX @@ void register_m68k_insns (CPUM68KState *env)
      BASE(trap,      4e40, fff0);
      BASE(link,      4e50, fff8);
      BASE(unlk,      4e58, fff8);
 -#if defined(CONFIG_SOFTMMU)
 +#if !defined(CONFIG_USER_ONLY)
      INSN(move_to_usp, 4e60, fff8, USP);
      INSN(move_from_usp, 4e68, fff8, USP);
      INSN(reset,     4e70, ffff, M68K);
@@ -XXX,XX +XXX,XX @@ void register_m68k_insns (CPUM68KState *env)
      INSN(ftrapcc,   f27a, fffe, FPU);       /* opmode 010, 011 */
      INSN(ftrapcc,   f27c, ffff, FPU);       /* opmode 100 */
      INSN(fbcc,      f280, ff80, FPU);
 -#if defined(CONFIG_SOFTMMU)
 +#if !defined(CONFIG_USER_ONLY)
      INSN(frestore,  f340, ffc0, CF_FPU);
      INSN(fsave,     f300, ffc0, CF_FPU);
      INSN(frestore,  f340, ffc0, FPU);
@@ -XXX,XX +XXX,XX @@ void m68k_cpu_dump_state(CPUState *cs, FILE *f, int flags)
          break;
      }
      qemu_fprintf(f, "\n");
 -#ifdef CONFIG_SOFTMMU
 +#ifndef CONFIG_USER_ONLY
      qemu_fprintf(f, "%sA7(MSP) = %08x %sA7(USP) = %08x %sA7(ISP) = %08x\n",
                   env->current_sp == M68K_SSP ? "->" : "  ", env->sp[M68K_SSP],
                   env->current_sp == M68K_USP ? "->" : "  ", env->sp[M68K_USP],
@@ -XXX,XX +XXX,XX @@ void m68k_cpu_dump_state(CPUState *cs, FILE *f, int flags)
                   env->mmu.ttr[M68K_ITTR0], env->mmu.ttr[M68K_ITTR1]);
      qemu_fprintf(f, "MMUSR %08x, fault at %08x\n",
                   env->mmu.mmusr, env->mmu.ar);
 -#endif
 +#endif /* !CONFIG_USER_ONLY */
  }
 --
-.20.1
+.34.1

-[PULL 09/16] cputlb: Pass CPUTLBDescFast to tlb_n_entries and sizeof_tlb
+[PULL 07/16] target/ppc: Check for USER_ONLY definition instead of SOFTMMU one
-We do not need the entire CPUArchState to compute these values.
+From: Philippe Mathieu-Daudé <philmd@linaro.org>
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+Since we *might* have user emulation with softmmu,
-Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
+replace the system emulation check by !user emulation one.
-Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
 Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
 Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
 Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
 Message-Id: <20230613133347.82210-5-philmd@linaro.org>
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- accel/tcg/cputlb.c | 15 ++++++++-------
+ target/ppc/cpu_init.c    | 20 ++++++++++----------
-file changed, 8 insertions(+), 7 deletions(-)
+ target/ppc/helper_regs.c |  6 ++----
 files changed, 12 insertions(+), 14 deletions(-)
-diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
+diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
 index XXXXXXX..XXXXXXX 100644
---- a/accel/tcg/cputlb.c
+--- a/target/ppc/cpu_init.c
-+++ b/accel/tcg/cputlb.c
++++ b/target/ppc/cpu_init.c
-@@ -XXX,XX +XXX,XX @@ QEMU_BUILD_BUG_ON(sizeof(target_ulong) > sizeof(run_on_cpu_data));
+@@ -XXX,XX +XXX,XX @@ POWERPC_FAMILY(970)(ObjectClass *oc, void *data)
- QEMU_BUILD_BUG_ON(NB_MMU_MODES > 16);
+                     (1ull << MSR_PMM) |
- #define ALL_MMUIDX_BITS ((1 << NB_MMU_MODES) - 1)
+                     (1ull << MSR_RI);
+     pcc->mmu_model = POWERPC_MMU_64B;
--static inline size_t tlb_n_entries(CPUArchState *env, uintptr_t mmu_idx)
+-#if defined(CONFIG_SOFTMMU)
-+static inline size_t tlb_n_entries(CPUTLBDescFast *fast)
++#if !defined(CONFIG_USER_ONLY)
      pcc->hash64_opts = &ppc_hash64_opts_basic;
  #endif
      pcc->excp_model = POWERPC_EXCP_970;
@@ -XXX,XX +XXX,XX @@ POWERPC_FAMILY(POWER5P)(ObjectClass *oc, void *data)
      pcc->lpcr_mask = LPCR_RMLS | LPCR_ILE | LPCR_LPES0 | LPCR_LPES1 |
          LPCR_RMI | LPCR_HDICE;
      pcc->mmu_model = POWERPC_MMU_2_03;
 -#if defined(CONFIG_SOFTMMU)
 +#if !defined(CONFIG_USER_ONLY)
      pcc->hash64_opts = &ppc_hash64_opts_basic;
      pcc->lrg_decr_bits = 32;
  #endif
@@ -XXX,XX +XXX,XX @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data)
          LPCR_LPES0 | LPCR_LPES1 | LPCR_HDICE;
      pcc->lpcr_pm = LPCR_P7_PECE0 | LPCR_P7_PECE1 | LPCR_P7_PECE2;
      pcc->mmu_model = POWERPC_MMU_2_06;
 -#if defined(CONFIG_SOFTMMU)
 +#if !defined(CONFIG_USER_ONLY)
      pcc->hash64_opts = &ppc_hash64_opts_POWER7;
      pcc->lrg_decr_bits = 32;
  #endif
@@ -XXX,XX +XXX,XX @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data)
      pcc->lpcr_pm = LPCR_P8_PECE0 | LPCR_P8_PECE1 | LPCR_P8_PECE2 |
                     LPCR_P8_PECE3 | LPCR_P8_PECE4;
      pcc->mmu_model = POWERPC_MMU_2_07;
 -#if defined(CONFIG_SOFTMMU)
 +#if !defined(CONFIG_USER_ONLY)
      pcc->hash64_opts = &ppc_hash64_opts_POWER7;
      pcc->lrg_decr_bits = 32;
      pcc->n_host_threads = 8;
@@ -XXX,XX +XXX,XX @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data)
      pcc->l1_icache_size = 0x8000;
  }
 -#ifdef CONFIG_SOFTMMU
 +#ifndef CONFIG_USER_ONLY
  /*
   * Radix pg sizes and AP encodings for dt node ibm,processor-radix-AP-encodings
   * Encoded as array of int_32s in the form:
@@ -XXX,XX +XXX,XX @@ static struct ppc_radix_page_info POWER9_radix_page_info = {
 x4000001e  /*  1G - enc: 0x2 */
      }
  };
 -#endif /* CONFIG_SOFTMMU */
 +#endif /* CONFIG_USER_ONLY */
  static void init_proc_POWER9(CPUPPCState *env)
  {
--    return (env_tlb(env)->f[mmu_idx].mask >> CPU_TLB_ENTRY_BITS) + 1;
+@@ -XXX,XX +XXX,XX @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)
-+    return (fast->mask >> CPU_TLB_ENTRY_BITS) + 1;
+         LPCR_HEIC | LPCR_LPES0 | LPCR_HVICE | LPCR_HDICE;
      pcc->lpcr_pm = LPCR_PDEE | LPCR_HDEE | LPCR_EEE | LPCR_DEE | LPCR_OEE;
      pcc->mmu_model = POWERPC_MMU_3_00;
 -#if defined(CONFIG_SOFTMMU)
 +#if !defined(CONFIG_USER_ONLY)
      /* segment page size remain the same */
      pcc->hash64_opts = &ppc_hash64_opts_POWER7;
      pcc->radix_page_info = &POWER9_radix_page_info;
@@ -XXX,XX +XXX,XX @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)
      pcc->l1_icache_size = 0x8000;
  }
--static inline size_t sizeof_tlb(CPUArchState *env, uintptr_t mmu_idx)
+-#ifdef CONFIG_SOFTMMU
-+static inline size_t sizeof_tlb(CPUTLBDescFast *fast)
++#ifndef CONFIG_USER_ONLY
  /*
   * Radix pg sizes and AP encodings for dt node ibm,processor-radix-AP-encodings
   * Encoded as array of int_32s in the form:
@@ -XXX,XX +XXX,XX @@ static struct ppc_radix_page_info POWER10_radix_page_info = {
 x4000001e  /*  1G - enc: 0x2 */
      }
  };
 -#endif /* CONFIG_SOFTMMU */
 +#endif /* !CONFIG_USER_ONLY */
  static void init_proc_POWER10(CPUPPCState *env)
  {
--    return env_tlb(env)->f[mmu_idx].mask + (1 << CPU_TLB_ENTRY_BITS);
+@@ -XXX,XX +XXX,XX @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data)
-+    return fast->mask + (1 << CPU_TLB_ENTRY_BITS);
      pcc->lpcr_pm = LPCR_PDEE | LPCR_HDEE | LPCR_EEE | LPCR_DEE | LPCR_OEE;
      pcc->mmu_model = POWERPC_MMU_3_00;
 -#if defined(CONFIG_SOFTMMU)
 +#if !defined(CONFIG_USER_ONLY)
      /* segment page size remain the same */
      pcc->hash64_opts = &ppc_hash64_opts_POWER7;
      pcc->radix_page_info = &POWER10_radix_page_info;
 diff --git a/target/ppc/helper_regs.c b/target/ppc/helper_regs.c
 index XXXXXXX..XXXXXXX 100644
 --- a/target/ppc/helper_regs.c
 +++ b/target/ppc/helper_regs.c
@@ -XXX,XX +XXX,XX @@ int hreg_store_msr(CPUPPCState *env, target_ulong value, int alter_hv)
      return excp;
  }
- static void tlb_window_reset(CPUTLBDesc *desc, int64_t ns,
+-#ifdef CONFIG_SOFTMMU
-@@ -XXX,XX +XXX,XX @@ static void tlb_dyn_init(CPUArchState *env)
++#ifndef CONFIG_USER_ONLY
- static void tlb_mmu_resize_locked(CPUArchState *env, int mmu_idx)
+ void store_40x_sler(CPUPPCState *env, uint32_t val)
  {
-     CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];
+     /* XXX: TO BE FIXED */
--    size_t old_size = tlb_n_entries(env, mmu_idx);
+@@ -XXX,XX +XXX,XX @@ void store_40x_sler(CPUPPCState *env, uint32_t val)
-+    size_t old_size = tlb_n_entries(&env_tlb(env)->f[mmu_idx]);
+     }
-     size_t rate;
+     env->spr[SPR_405_SLER] = val;
      size_t new_size = old_size;
      int64_t now = get_clock_realtime();
@@ -XXX,XX +XXX,XX @@ static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
      env_tlb(env)->d[mmu_idx].large_page_addr = -1;
      env_tlb(env)->d[mmu_idx].large_page_mask = -1;
      env_tlb(env)->d[mmu_idx].vindex = 0;
 -    memset(env_tlb(env)->f[mmu_idx].table, -1, sizeof_tlb(env, mmu_idx));
 +    memset(env_tlb(env)->f[mmu_idx].table, -1,
 +           sizeof_tlb(&env_tlb(env)->f[mmu_idx]));
      memset(env_tlb(env)->d[mmu_idx].vtable, -1,
             sizeof(env_tlb(env)->d[0].vtable));
  }
-@@ -XXX,XX +XXX,XX @@ void tlb_reset_dirty(CPUState *cpu, ram_addr_t start1, ram_addr_t length)
+-#endif /* CONFIG_SOFTMMU */
-     qemu_spin_lock(&env_tlb(env)->c.lock);
-     for (mmu_idx = 0; mmu_idx < NB_MMU_MODES; mmu_idx++) {
+-#ifndef CONFIG_USER_ONLY
-         unsigned int i;
+ void check_tlb_flush(CPUPPCState *env, bool global)
--        unsigned int n = tlb_n_entries(env, mmu_idx);
+ {
-+        unsigned int n = tlb_n_entries(&env_tlb(env)->f[mmu_idx]);
+     CPUState *cs = env_cpu(env);
+@@ -XXX,XX +XXX,XX @@ void check_tlb_flush(CPUPPCState *env, bool global)
-         for (i = 0; i < n; i++) {
+         tlb_flush(cs);
-             tlb_reset_dirty_range_locked(&env_tlb(env)->f[mmu_idx].table[i],
+     }
  }
 -#endif
 +#endif /* !CONFIG_USER_ONLY */
  /**
   * _spr_register
 --
-.20.1
+.34.1

-[PULL 12/16] cputlb: Split out tlb_mmu_flush_locked
+[PULL 08/16] hw/core/cpu: Check for USER_ONLY definition instead of SOFTMMU one
-We will want to be able to flush a tlb without resizing.
+From: Philippe Mathieu-Daudé <philmd@linaro.org>
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+Since we *might* have user emulation with softmmu,
-Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
+replace the system emulation check by !user emulation one.
-Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
 Invert the #ifdef'ry in TCGCPUOps structure for clarity.
 Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
 Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
 Message-Id: <20230613133347.82210-6-philmd@linaro.org>
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- accel/tcg/cputlb.c | 15 ++++++++++-----
+ include/hw/core/cpu.h         |   4 +-
-file changed, 10 insertions(+), 5 deletions(-)
+ include/hw/core/tcg-cpu-ops.h | 102 +++++++++++++++++-----------------
 files changed, 53 insertions(+), 53 deletions(-)
-diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
+diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
 index XXXXXXX..XXXXXXX 100644
---- a/accel/tcg/cputlb.c
+--- a/include/hw/core/cpu.h
-+++ b/accel/tcg/cputlb.c
++++ b/include/hw/core/cpu.h
-@@ -XXX,XX +XXX,XX @@ static void tlb_mmu_resize_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)
+@@ -XXX,XX +XXX,XX @@ void page_size_init(void);
-     }
  #ifdef NEED_CPU_H
 -#ifdef CONFIG_SOFTMMU
 +#ifndef CONFIG_USER_ONLY
  extern const VMStateDescription vmstate_cpu_common;
@@ -XXX,XX +XXX,XX @@ extern const VMStateDescription vmstate_cpu_common;
      .flags = VMS_STRUCT,                                                    \
      .offset = 0,                                                            \
  }
+-#endif /* CONFIG_SOFTMMU */
--static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
++#endif /* !CONFIG_USER_ONLY */
-+static void tlb_mmu_flush_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)
- {
+ #endif /* NEED_CPU_H */
--    CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];
--    CPUTLBDescFast *fast = &env_tlb(env)->f[mmu_idx];
+diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h
--
+index XXXXXXX..XXXXXXX 100644
--    tlb_mmu_resize_locked(desc, fast);
+--- a/include/hw/core/tcg-cpu-ops.h
-     desc->n_used_entries = 0;
++++ b/include/hw/core/tcg-cpu-ops.h
-     desc->large_page_addr = -1;
+@@ -XXX,XX +XXX,XX @@ struct TCGCPUOps {
-     desc->large_page_mask = -1;
+      */
-@@ -XXX,XX +XXX,XX @@ static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
+     void (*do_interrupt)(CPUState *cpu);
-     memset(desc->vtable, -1, sizeof(desc->vtable));
+ #endif /* !CONFIG_USER_ONLY || !TARGET_I386 */
- }
+-#ifdef CONFIG_SOFTMMU
++#ifdef CONFIG_USER_ONLY
-+static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
++    /**
-+{
++     * record_sigsegv:
-+    CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];
++     * @cpu: cpu context
-+    CPUTLBDescFast *fast = &env_tlb(env)->f[mmu_idx];
++     * @addr: faulting guest address
-+
++     * @access_type: access was read/write/execute
-+    tlb_mmu_resize_locked(desc, fast);
++     * @maperr: true for invalid page, false for permission fault
-+    tlb_mmu_flush_locked(desc, fast);
++     * @ra: host pc for unwinding
-+}
++     *
-+
++     * We are about to raise SIGSEGV with si_code set for @maperr,
- static inline void tlb_n_used_entries_inc(CPUArchState *env, uintptr_t mmu_idx)
++     * and si_addr set for @addr.  Record anything further needed
- {
++     * for the signal ucontext_t.
-     env_tlb(env)->d[mmu_idx].n_used_entries++;
++     *
 +     * If the emulated kernel does not provide anything to the signal
 +     * handler with anything besides the user context registers, and
 +     * the siginfo_t, then this hook need do nothing and may be omitted.
 +     * Otherwise, record the data and return; the caller will raise
 +     * the signal, unwind the cpu state, and return to the main loop.
 +     *
 +     * If it is simpler to re-use the sysemu tlb_fill code, @ra is provided
 +     * so that a "normal" cpu exception can be raised.  In this case,
 +     * the signal must be raised by the architecture cpu_loop.
 +     */
 +    void (*record_sigsegv)(CPUState *cpu, vaddr addr,
 +                           MMUAccessType access_type,
 +                           bool maperr, uintptr_t ra);
 +    /**
 +     * record_sigbus:
 +     * @cpu: cpu context
 +     * @addr: misaligned guest address
 +     * @access_type: access was read/write/execute
 +     * @ra: host pc for unwinding
 +     *
 +     * We are about to raise SIGBUS with si_code BUS_ADRALN,
 +     * and si_addr set for @addr.  Record anything further needed
 +     * for the signal ucontext_t.
 +     *
 +     * If the emulated kernel does not provide the signal handler with
 +     * anything besides the user context registers, and the siginfo_t,
 +     * then this hook need do nothing and may be omitted.
 +     * Otherwise, record the data and return; the caller will raise
 +     * the signal, unwind the cpu state, and return to the main loop.
 +     *
 +     * If it is simpler to re-use the sysemu do_unaligned_access code,
 +     * @ra is provided so that a "normal" cpu exception can be raised.
 +     * In this case, the signal must be raised by the architecture cpu_loop.
 +     */
 +    void (*record_sigbus)(CPUState *cpu, vaddr addr,
 +                          MMUAccessType access_type, uintptr_t ra);
 +#else
      /** @cpu_exec_interrupt: Callback for processing interrupts in cpu_exec */
      bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request);
      /**
@@ -XXX,XX +XXX,XX @@ struct TCGCPUOps {
       */
      bool (*io_recompile_replay_branch)(CPUState *cpu,
                                         const TranslationBlock *tb);
 -#else
 -    /**
 -     * record_sigsegv:
 -     * @cpu: cpu context
 -     * @addr: faulting guest address
 -     * @access_type: access was read/write/execute
 -     * @maperr: true for invalid page, false for permission fault
 -     * @ra: host pc for unwinding
 -     *
 -     * We are about to raise SIGSEGV with si_code set for @maperr,
 -     * and si_addr set for @addr.  Record anything further needed
 -     * for the signal ucontext_t.
 -     *
 -     * If the emulated kernel does not provide anything to the signal
 -     * handler with anything besides the user context registers, and
 -     * the siginfo_t, then this hook need do nothing and may be omitted.
 -     * Otherwise, record the data and return; the caller will raise
 -     * the signal, unwind the cpu state, and return to the main loop.
 -     *
 -     * If it is simpler to re-use the sysemu tlb_fill code, @ra is provided
 -     * so that a "normal" cpu exception can be raised.  In this case,
 -     * the signal must be raised by the architecture cpu_loop.
 -     */
 -    void (*record_sigsegv)(CPUState *cpu, vaddr addr,
 -                           MMUAccessType access_type,
 -                           bool maperr, uintptr_t ra);
 -    /**
 -     * record_sigbus:
 -     * @cpu: cpu context
 -     * @addr: misaligned guest address
 -     * @access_type: access was read/write/execute
 -     * @ra: host pc for unwinding
 -     *
 -     * We are about to raise SIGBUS with si_code BUS_ADRALN,
 -     * and si_addr set for @addr.  Record anything further needed
 -     * for the signal ucontext_t.
 -     *
 -     * If the emulated kernel does not provide the signal handler with
 -     * anything besides the user context registers, and the siginfo_t,
 -     * then this hook need do nothing and may be omitted.
 -     * Otherwise, record the data and return; the caller will raise
 -     * the signal, unwind the cpu state, and return to the main loop.
 -     *
 -     * If it is simpler to re-use the sysemu do_unaligned_access code,
 -     * @ra is provided so that a "normal" cpu exception can be raised.
 -     * In this case, the signal must be raised by the architecture cpu_loop.
 -     */
 -    void (*record_sigbus)(CPUState *cpu, vaddr addr,
 -                          MMUAccessType access_type, uintptr_t ra);
 -#endif /* CONFIG_SOFTMMU */
 +#endif /* !CONFIG_USER_ONLY */
  #endif /* NEED_CPU_H */
  };
 --
-.20.1
+.34.1

-[PULL 08/16] cputlb: Make tlb_n_entries private to cputlb.c
+[PULL 09/16] accel/tcg: Check for USER_ONLY definition instead of SOFTMMU one
-There are no users of this function outside cputlb.c,
+From: Philippe Mathieu-Daudé <philmd@linaro.org>
 and its interface will change in the next patch.
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+Since we *might* have user emulation with softmmu,
-Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
+replace the system emulation check by !user emulation one.
-Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
 Invert some if() ladders for clarity.
 Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
 Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
 Message-Id: <20230613133347.82210-7-philmd@linaro.org>
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- include/exec/cpu_ldst.h | 5 -----
+ accel/tcg/internal.h | 6 +++---
- accel/tcg/cputlb.c      | 5 +++++
+ accel/tcg/cpu-exec.c | 4 ++--
 files changed, 5 insertions(+), 5 deletions(-)
-diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
+diff --git a/accel/tcg/internal.h b/accel/tcg/internal.h
 index XXXXXXX..XXXXXXX 100644
---- a/include/exec/cpu_ldst.h
+--- a/accel/tcg/internal.h
-+++ b/include/exec/cpu_ldst.h
++++ b/accel/tcg/internal.h
-@@ -XXX,XX +XXX,XX @@ static inline uintptr_t tlb_index(CPUArchState *env, uintptr_t mmu_idx,
+@@ -XXX,XX +XXX,XX @@
-     return (addr >> TARGET_PAGE_BITS) & size_mask;
+  * memory related structures are protected with mmap_lock.
- }
+  * In !user-mode we use per-page locks.
+  */
--static inline size_t tlb_n_entries(CPUArchState *env, uintptr_t mmu_idx)
+-#ifdef CONFIG_SOFTMMU
--{
+-#define assert_memory_lock()
--    return (env_tlb(env)->f[mmu_idx].mask >> CPU_TLB_ENTRY_BITS) + 1;
+-#else
--}
++#ifdef CONFIG_USER_ONLY
--
+ #define assert_memory_lock() tcg_debug_assert(have_mmap_lock())
- /* Find the TLB entry corresponding to the mmu_idx + address pair.  */
++#else
- static inline CPUTLBEntry *tlb_entry(CPUArchState *env, uintptr_t mmu_idx,
++#define assert_memory_lock()
-                                      target_ulong addr)
+ #endif
-diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
  #if defined(CONFIG_SOFTMMU) && defined(CONFIG_DEBUG_TCG)
 diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
 index XXXXXXX..XXXXXXX 100644
---- a/accel/tcg/cputlb.c
+--- a/accel/tcg/cpu-exec.c
-+++ b/accel/tcg/cputlb.c
++++ b/accel/tcg/cpu-exec.c
-@@ -XXX,XX +XXX,XX @@ QEMU_BUILD_BUG_ON(sizeof(target_ulong) > sizeof(run_on_cpu_data));
+@@ -XXX,XX +XXX,XX @@ void cpu_exec_step_atomic(CPUState *cpu)
- QEMU_BUILD_BUG_ON(NB_MMU_MODES > 16);
+         cpu_tb_exec(cpu, tb, &tb_exit);
- #define ALL_MMUIDX_BITS ((1 << NB_MMU_MODES) - 1)
+         cpu_exec_exit(cpu);
+     } else {
-+static inline size_t tlb_n_entries(CPUArchState *env, uintptr_t mmu_idx)
+-#ifndef CONFIG_SOFTMMU
-+{
++#ifdef CONFIG_USER_ONLY
-+    return (env_tlb(env)->f[mmu_idx].mask >> CPU_TLB_ENTRY_BITS) + 1;
+         clear_helper_retaddr();
-+}
+         if (have_mmap_lock()) {
-+
+             mmap_unlock();
- static inline size_t sizeof_tlb(CPUArchState *env, uintptr_t mmu_idx)
+@@ -XXX,XX +XXX,XX @@ static int cpu_exec_setjmp(CPUState *cpu, SyncClocks *sc)
- {
+         /* Non-buggy compilers preserve this; assert the correct value. */
-     return env_tlb(env)->f[mmu_idx].mask + (1 << CPU_TLB_ENTRY_BITS);
+         g_assert(cpu == current_cpu);
 -#ifndef CONFIG_SOFTMMU
 +#ifdef CONFIG_USER_ONLY
          clear_helper_retaddr();
          if (have_mmap_lock()) {
              mmap_unlock();
 --
-.20.1
+.34.1

-[PULL 11/16] cputlb: Hoist tlb portions in tlb_flush_one_mmuidx_locked
+[PULL 10/16] meson: Alias CONFIG_SOFTMMU -> CONFIG_SYSTEM_ONLY
-No functional change, but the smaller expressions make
+From: Philippe Mathieu-Daudé <philmd@linaro.org>
 the code easier to read.
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+We use the CONFIG_USER_ONLY key to describe user emulation,
-Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
+and the CONFIG_SOFTMMU key to describe system emulation. Alias
-Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+it as 'CONFIG_SYSTEM_ONLY' for parity with user emulation.
 Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
 Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
 Message-Id: <20230613133347.82210-8-philmd@linaro.org>
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- accel/tcg/cputlb.c | 19 ++++++++++---------
+ meson.build | 1 +
-file changed, 10 insertions(+), 9 deletions(-)
+file changed, 1 insertion(+)
-diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
+diff --git a/meson.build b/meson.build
 index XXXXXXX..XXXXXXX 100644
---- a/accel/tcg/cputlb.c
+--- a/meson.build
-+++ b/accel/tcg/cputlb.c
++++ b/meson.build
-@@ -XXX,XX +XXX,XX @@ static void tlb_mmu_resize_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)
+@@ -XXX,XX +XXX,XX @@ foreach target : target_dirs
+     endif
- static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
+     config_target += { 'CONFIG_BSD_USER': 'y' }
- {
+   elif target.endswith('softmmu')
--    tlb_mmu_resize_locked(&env_tlb(env)->d[mmu_idx], &env_tlb(env)->f[mmu_idx]);
++    config_target += { 'CONFIG_SYSTEM_ONLY': 'y' }
--    env_tlb(env)->d[mmu_idx].n_used_entries = 0;
+     config_target += { 'CONFIG_SOFTMMU': 'y' }
--    env_tlb(env)->d[mmu_idx].large_page_addr = -1;
+   endif
--    env_tlb(env)->d[mmu_idx].large_page_mask = -1;
+   if target.endswith('-user')
 -    env_tlb(env)->d[mmu_idx].vindex = 0;
 -    memset(env_tlb(env)->f[mmu_idx].table, -1,
 -           sizeof_tlb(&env_tlb(env)->f[mmu_idx]));
 -    memset(env_tlb(env)->d[mmu_idx].vtable, -1,
 -           sizeof(env_tlb(env)->d[0].vtable));
 +    CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];
 +    CPUTLBDescFast *fast = &env_tlb(env)->f[mmu_idx];
 +
 +    tlb_mmu_resize_locked(desc, fast);
 +    desc->n_used_entries = 0;
 +    desc->large_page_addr = -1;
 +    desc->large_page_mask = -1;
 +    desc->vindex = 0;
 +    memset(fast->table, -1, sizeof_tlb(fast));
 +    memset(desc->vtable, -1, sizeof(desc->vtable));
  }
  static inline void tlb_n_used_entries_inc(CPUArchState *env, uintptr_t mmu_idx)
 --
-.20.1
+.34.1

-[PULL 07/16] cputlb: Merge tlb_table_flush_by_mmuidx into tlb_flush_one_mmuidx_locked
+[PULL 11/16] meson: Replace CONFIG_SOFTMMU -> CONFIG_SYSTEM_ONLY
-There is only one caller for tlb_table_flush_by_mmuidx.  Place
+From: Philippe Mathieu-Daudé <philmd@linaro.org>
-the result at the earlier line number, due to an expected user
-in the near future.
+Since we *might* have user emulation with softmmu,
+use the clearer 'CONFIG_SYSTEM_ONLY' key to check
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+for system emulation.
-Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
 Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
 Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
 Message-Id: <20230613133347.82210-9-philmd@linaro.org>
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- accel/tcg/cputlb.c | 19 +++++++------------
+ meson.build                        | 4 ++--
-file changed, 7 insertions(+), 12 deletions(-)
+ accel/qtest/meson.build            | 2 +-
+ accel/stubs/meson.build            | 2 +-
-diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
+ accel/tcg/meson.build              | 6 +++---
-index XXXXXXX..XXXXXXX 100644
+ dump/meson.build                   | 2 +-
---- a/accel/tcg/cputlb.c
+ hw/i386/kvm/meson.build            | 2 +-
-+++ b/accel/tcg/cputlb.c
+ migration/meson.build              | 2 +-
-@@ -XXX,XX +XXX,XX @@ static void tlb_mmu_resize_locked(CPUArchState *env, int mmu_idx)
+ monitor/meson.build                | 2 +-
-     }
+ qapi/meson.build                   | 2 +-
  semihosting/meson.build            | 2 +-
  softmmu/meson.build                | 4 ++--
  target/i386/tcg/sysemu/meson.build | 2 +-
  ui/meson.build                     | 4 ++--
 files changed, 18 insertions(+), 18 deletions(-)
 diff --git a/meson.build b/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/meson.build
 +++ b/meson.build
@@ -XXX,XX +XXX,XX @@ config_all += config_host
  config_all += config_all_disas
  config_all += {
    'CONFIG_XEN': xen.found(),
 -  'CONFIG_SOFTMMU': have_system,
 +  'CONFIG_SYSTEM_ONLY': have_system,
    'CONFIG_USER_ONLY': have_user,
    'CONFIG_ALL': true,
  }
+@@ -XXX,XX +XXX,XX @@ endif
--static inline void tlb_table_flush_by_mmuidx(CPUArchState *env, int mmu_idx)
+ softmmu_ss.add(authz, blockdev, chardev, crypto, io, qmp)
-+static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
+ common_ss.add(qom, qemuutil)
- {
-     tlb_mmu_resize_locked(env, mmu_idx);
+-common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: [softmmu_ss])
--    memset(env_tlb(env)->f[mmu_idx].table, -1, sizeof_tlb(env, mmu_idx));
++common_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: [softmmu_ss])
-     env_tlb(env)->d[mmu_idx].n_used_entries = 0;
+ common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss)
-+    env_tlb(env)->d[mmu_idx].large_page_addr = -1;
-+    env_tlb(env)->d[mmu_idx].large_page_mask = -1;
+ common_all = common_ss.apply(config_all, strict: false)
-+    env_tlb(env)->d[mmu_idx].vindex = 0;
+diff --git a/accel/qtest/meson.build b/accel/qtest/meson.build
-+    memset(env_tlb(env)->f[mmu_idx].table, -1, sizeof_tlb(env, mmu_idx));
+index XXXXXXX..XXXXXXX 100644
-+    memset(env_tlb(env)->d[mmu_idx].vtable, -1,
+--- a/accel/qtest/meson.build
-+           sizeof(env_tlb(env)->d[0].vtable));
++++ b/accel/qtest/meson.build
- }
+@@ -1 +1 @@
+-qtest_module_ss.add(when: ['CONFIG_SOFTMMU'], if_true: files('qtest.c'))
- static inline void tlb_n_used_entries_inc(CPUArchState *env, uintptr_t mmu_idx)
++qtest_module_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: files('qtest.c'))
-@@ -XXX,XX +XXX,XX @@ void tlb_flush_counts(size_t *pfull, size_t *ppart, size_t *pelide)
+diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build
-     *pelide = elide;
+index XXXXXXX..XXXXXXX 100644
- }
+--- a/accel/stubs/meson.build
++++ b/accel/stubs/meson.build
--static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
+@@ -XXX,XX +XXX,XX @@ sysemu_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c'))
--{
+ sysemu_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c'))
--    tlb_table_flush_by_mmuidx(env, mmu_idx);
+ sysemu_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c'))
--    env_tlb(env)->d[mmu_idx].large_page_addr = -1;
--    env_tlb(env)->d[mmu_idx].large_page_mask = -1;
+-specific_ss.add_all(when: ['CONFIG_SOFTMMU'], if_true: sysemu_stubs_ss)
--    env_tlb(env)->d[mmu_idx].vindex = 0;
++specific_ss.add_all(when: ['CONFIG_SYSTEM_ONLY'], if_true: sysemu_stubs_ss)
--    memset(env_tlb(env)->d[mmu_idx].vtable, -1,
+diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build
--           sizeof(env_tlb(env)->d[0].vtable));
+index XXXXXXX..XXXXXXX 100644
--}
+--- a/accel/tcg/meson.build
--
++++ b/accel/tcg/meson.build
- static void tlb_flush_by_mmuidx_async_work(CPUState *cpu, run_on_cpu_data data)
+@@ -XXX,XX +XXX,XX @@ tcg_ss.add(files(
- {
+   'translator.c',
-     CPUArchState *env = cpu->env_ptr;
+ ))
  tcg_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c'))
 -tcg_ss.add(when: 'CONFIG_SOFTMMU', if_false: files('user-exec-stub.c'))
 +tcg_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_false: files('user-exec-stub.c'))
  tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: [files('plugin-gen.c')])
  tcg_ss.add(when: libdw, if_true: files('debuginfo.c'))
  tcg_ss.add(when: 'CONFIG_LINUX', if_true: files('perf.c'))
  specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss)
 -specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files(
 +specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
    'cputlb.c',
    'monitor.c',
  ))
 -tcg_module_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files(
 +tcg_module_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
    'tcg-accel-ops.c',
    'tcg-accel-ops-mttcg.c',
    'tcg-accel-ops-icount.c',
 diff --git a/dump/meson.build b/dump/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/dump/meson.build
 +++ b/dump/meson.build
@@ -XXX,XX +XXX,XX @@
  softmmu_ss.add([files('dump.c', 'dump-hmp-cmds.c'), snappy, lzo])
 -specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('win_dump.c'))
 +specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: files('win_dump.c'))
 diff --git a/hw/i386/kvm/meson.build b/hw/i386/kvm/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/i386/kvm/meson.build
 +++ b/hw/i386/kvm/meson.build
@@ -XXX,XX +XXX,XX @@ xen_stubs_ss.add(when: 'CONFIG_XEN_EMU', if_false: files(
    'xen-stubs.c',
  ))
 -specific_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: xen_stubs_ss)
 +specific_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: xen_stubs_ss)
 diff --git a/migration/meson.build b/migration/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/migration/meson.build
 +++ b/migration/meson.build
@@ -XXX,XX +XXX,XX @@ if get_option('live_block_migration').allowed()
  endif
  softmmu_ss.add(when: zstd, if_true: files('multifd-zstd.c'))
 -specific_ss.add(when: 'CONFIG_SOFTMMU',
 +specific_ss.add(when: 'CONFIG_SYSTEM_ONLY',
                  if_true: files('ram.c',
                                 'target.c'))
 diff --git a/monitor/meson.build b/monitor/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/monitor/meson.build
 +++ b/monitor/meson.build
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(files(
  ))
  softmmu_ss.add([spice_headers, files('qmp-cmds.c')])
 -specific_ss.add(when: 'CONFIG_SOFTMMU',
 +specific_ss.add(when: 'CONFIG_SYSTEM_ONLY',
          if_true: [files( 'hmp-cmds-target.c', 'hmp-target.c'), spice])
 diff --git a/qapi/meson.build b/qapi/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/qapi/meson.build
 +++ b/qapi/meson.build
@@ -XXX,XX +XXX,XX @@ foreach output : qapi_specific_outputs + qapi_nonmodule_outputs
    if output.endswith('.trace-events')
      qapi_trace_events += qapi_files[i]
    endif
 -  specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: qapi_files[i])
 +  specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: qapi_files[i])
    i = i + 1
  endforeach
 diff --git a/semihosting/meson.build b/semihosting/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/semihosting/meson.build
 +++ b/semihosting/meson.build
@@ -XXX,XX +XXX,XX @@ specific_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files(
    'syscalls.c',
  ))
 -specific_ss.add(when: ['CONFIG_SEMIHOSTING', 'CONFIG_SOFTMMU'], if_true: files(
 +specific_ss.add(when: ['CONFIG_SEMIHOSTING', 'CONFIG_SYSTEM_ONLY'], if_true: files(
    'config.c',
    'console.c',
    'uaccess.c',
 diff --git a/softmmu/meson.build b/softmmu/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/softmmu/meson.build
 +++ b/softmmu/meson.build
@@ -XXX,XX +XXX,XX @@
 -specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files(
 +specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files(
    'arch_init.c',
    'ioport.c',
    'memory.c',
@@ -XXX,XX +XXX,XX @@ specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files(
    'watchpoint.c',
  )])
 -specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: [files(
 +specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: [files(
    'icount.c',
  )])
 diff --git a/target/i386/tcg/sysemu/meson.build b/target/i386/tcg/sysemu/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/i386/tcg/sysemu/meson.build
 +++ b/target/i386/tcg/sysemu/meson.build
@@ -XXX,XX +XXX,XX @@
 -i386_softmmu_ss.add(when: ['CONFIG_TCG', 'CONFIG_SOFTMMU'], if_true: files(
 +i386_softmmu_ss.add(when: ['CONFIG_TCG', 'CONFIG_SYSTEM_ONLY'], if_true: files(
    'tcg-cpu.c',
    'smm_helper.c',
    'excp_helper.c',
 diff --git a/ui/meson.build b/ui/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/ui/meson.build
 +++ b/ui/meson.build
@@ -XXX,XX +XXX,XX @@
  softmmu_ss.add(pixman)
 -specific_ss.add(when: ['CONFIG_SOFTMMU'], if_true: pixman)   # for the include path
 -specific_ss.add(when: ['CONFIG_SOFTMMU'], if_true: opengl)   # for the include path
 +specific_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: pixman)   # for the include path
 +specific_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: opengl)   # for the include path
  softmmu_ss.add(png)
  softmmu_ss.add(files(
 --
-.20.1
+.34.1

-[PULL 06/16] vl: Only choose enabled accelerators in configure_accelerators
+[PULL 12/16] meson: Replace softmmu_ss -> system_ss
-By choosing "tcg:kvm" when kvm is not enabled, we generate
+From: Philippe Mathieu-Daudé <philmd@linaro.org>
 an incorrect warning: "invalid accelerator kvm".
-At the same time, use g_str_has_suffix rather than open-coding
+We use the user_ss[] array to hold the user emulation sources,
-the same operation.
+and the softmmu_ss[] array to hold the system emulation ones.
 Hold the latter in the 'system_ss[]' array for parity with user
 emulation.
-Presumably the inverse is also true with --disable-tcg.
+Mechanical change doing:
-Fixes: 28a0961757fc
+  $ sed -i -e s/softmmu_ss/system_ss/g $(git grep -l softmmu_ss)
-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-Reviewed by: Aleksandar Markovic <amarkovic@wavecomp.com>
+Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
 Message-Id: <20230613133347.82210-10-philmd@linaro.org>
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- vl.c | 21 +++++++++++++--------
+ docs/devel/build-system.rst        |  14 +--
-file changed, 13 insertions(+), 8 deletions(-)
+ meson.build                        |  12 +--
  accel/meson.build                  |   4 +-
  audio/meson.build                  |   8 +-
  backends/meson.build               |  20 ++--
  backends/tpm/meson.build           |   8 +-
  block/meson.build                  |   6 +-
  block/monitor/meson.build          |   2 +-
  chardev/meson.build                |   2 +-
  disas/meson.build                  |   2 +-
  dump/meson.build                   |   2 +-
  ebpf/meson.build                   |   2 +-
  fsdev/meson.build                  |   4 +-
  gdbstub/meson.build                |  10 +-
  hw/9pfs/meson.build                |   2 +-
  hw/acpi/meson.build                |  10 +-
  hw/adc/meson.build                 |  10 +-
  hw/arm/meson.build                 |   8 +-
  hw/audio/meson.build               |  28 +++---
  hw/block/meson.build               |  28 +++---
  hw/char/meson.build                |  70 +++++++-------
  hw/core/meson.build                |  22 ++---
  hw/cpu/meson.build                 |   6 +-
  hw/cxl/meson.build                 |   4 +-
  hw/display/meson.build             |  76 +++++++--------
  hw/dma/meson.build                 |  32 +++----
  hw/gpio/meson.build                |  26 ++---
  hw/i2c/meson.build                 |   2 +-
  hw/ide/meson.build                 |  28 +++---
  hw/input/meson.build               |  32 +++----
  hw/intc/meson.build                |  44 ++++-----
  hw/ipack/meson.build               |   2 +-
  hw/ipmi/meson.build                |   2 +-
  hw/isa/meson.build                 |  18 ++--
  hw/mem/meson.build                 |   8 +-
  hw/misc/macio/meson.build          |   2 +-
  hw/misc/meson.build                | 148 ++++++++++++++---------------
  hw/net/can/meson.build             |  16 ++--
  hw/net/meson.build                 |  96 +++++++++----------
  hw/nubus/meson.build               |   2 +-
  hw/nvme/meson.build                |   2 +-
  hw/nvram/meson.build               |  26 ++---
  hw/pci-bridge/meson.build          |   4 +-
  hw/pci-host/meson.build            |   2 +-
  hw/pci/meson.build                 |   8 +-
  hw/pcmcia/meson.build              |   4 +-
  hw/rdma/meson.build                |   2 +-
  hw/remote/meson.build              |   2 +-
  hw/rtc/meson.build                 |  28 +++---
  hw/scsi/meson.build                |   2 +-
  hw/sd/meson.build                  |  24 ++---
  hw/sensor/meson.build              |  18 ++--
  hw/smbios/meson.build              |   6 +-
  hw/ssi/meson.build                 |  26 ++---
  hw/timer/meson.build               |  74 +++++++--------
  hw/tpm/meson.build                 |  14 +--
  hw/usb/meson.build                 |  74 +++++++--------
  hw/virtio/meson.build              |  12 +--
  hw/watchdog/meson.build            |  18 ++--
  hw/xen/meson.build                 |   4 +-
  migration/meson.build              |  10 +-
  monitor/meson.build                |   4 +-
  net/can/meson.build                |   2 +-
  net/meson.build                    |  38 ++++----
  qom/meson.build                    |   2 +-
  replay/meson.build                 |   2 +-
  softmmu/meson.build                |   8 +-
  stats/meson.build                  |   2 +-
  target/alpha/meson.build           |   6 +-
  target/arm/hvf/meson.build         |   2 +-
  target/arm/meson.build             |   6 +-
  target/arm/tcg/meson.build         |   2 +-
  target/avr/meson.build             |   6 +-
  target/cris/meson.build            |   6 +-
  target/hppa/meson.build            |   6 +-
  target/i386/hax/meson.build        |   6 +-
  target/i386/hvf/meson.build        |   2 +-
  target/i386/kvm/meson.build        |   4 +-
  target/i386/meson.build            |   8 +-
  target/i386/nvmm/meson.build       |   4 +-
  target/i386/tcg/sysemu/meson.build |   2 +-
  target/i386/whpx/meson.build       |   2 +-
  target/loongarch/meson.build       |   6 +-
  target/m68k/meson.build            |   6 +-
  target/microblaze/meson.build      |   6 +-
  target/mips/meson.build            |   4 +-
  target/mips/sysemu/meson.build     |   2 +-
  target/mips/tcg/sysemu/meson.build |   2 +-
  target/nios2/meson.build           |   6 +-
  target/openrisc/meson.build        |   6 +-
  target/ppc/meson.build             |  10 +-
  target/riscv/meson.build           |   6 +-
  target/s390x/kvm/meson.build       |   2 +-
  target/s390x/meson.build           |   6 +-
  target/sh4/meson.build             |   6 +-
  target/sparc/meson.build           |   6 +-
  target/tricore/meson.build         |   4 +-
  target/xtensa/meson.build          |   6 +-
  tcg/meson.build                    |   2 +-
  trace/meson.build                  |   2 +-
  ui/meson.build                     |  26 ++---
 files changed, 706 insertions(+), 706 deletions(-)
-diff --git a/vl.c b/vl.c
+diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst
 index XXXXXXX..XXXXXXX 100644
---- a/vl.c
+--- a/docs/devel/build-system.rst
-+++ b/vl.c
++++ b/docs/devel/build-system.rst
-@@ -XXX,XX +XXX,XX @@ static void configure_accelerators(const char *progname)
+@@ -XXX,XX +XXX,XX @@ Target-independent emulator sourcesets:
+   This includes error handling infrastructure, standard data structures,
-         if (accel == NULL) {
+   platform portability wrapper functions, etc.
-             /* Select the default accelerator */
--            if (!accel_find("tcg") && !accel_find("kvm")) {
+-  Target-independent code lives in the ``common_ss``, ``softmmu_ss`` and
--                error_report("No accelerator selected and"
++  Target-independent code lives in the ``common_ss``, ``system_ss`` and
--                             " no default accelerator available");
+   ``user_ss`` sourcesets.  ``common_ss`` is linked into all emulators,
--                exit(1);
+-  ``softmmu_ss`` only in system emulators, ``user_ss`` only in user-mode
--            } else {
++  ``system_ss`` only in system emulators, ``user_ss`` only in user-mode
--                int pnlen = strlen(progname);
+   emulators.
--                if (pnlen >= 3 && g_str_equal(&progname[pnlen - 3], "kvm")) {
-+            bool have_tcg = accel_find("tcg");
+   Target-independent sourcesets must exercise particular care when using
-+            bool have_kvm = accel_find("kvm");
+@@ -XXX,XX +XXX,XX @@ Target-independent emulator sourcesets:
-+
+   symbol::
-+            if (have_tcg && have_kvm) {
-+                if (g_str_has_suffix(progname, "kvm")) {
+     # Some targets have CONFIG_ACPI, some don't, so this is not enough
-                     /* If the program name ends with "kvm", we prefer KVM */
+-    softmmu_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi.c'),
-                     accel = "kvm:tcg";
++    system_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi.c'),
-                 } else {
+                                         if_false: files('acpi-stub.c'))
-                     accel = "tcg:kvm";
-                 }
+     # This is required as well:
-+            } else if (have_kvm) {
+-    softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c'))
-+                accel = "kvm";
++    system_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c'))
-+            } else if (have_tcg) {
-+                accel = "tcg";
+ Target-dependent emulator sourcesets:
-+            } else {
+   In the target-dependent set lives CPU emulation, some device emulation and
-+                error_report("No accelerator selected and"
+@@ -XXX,XX +XXX,XX @@ Target-dependent emulator sourcesets:
-+                             " no default accelerator available");
+   for all emulators and for system emulators only.  For example::
-+                exit(1);
-             }
+     arm_ss = ss.source_set()
-         }
+-    arm_softmmu_ss = ss.source_set()
--
++    arm_system_ss = ss.source_set()
-         accel_list = g_strsplit(accel, ":", 0);
+     ...
+     target_arch += {'arm': arm_ss}
-         for (tmp = accel_list; *tmp; tmp++) {
+-    target_softmmu_arch += {'arm': arm_softmmu_ss}
 +    target_softmmu_arch += {'arm': arm_system_ss}
  Module sourcesets:
    There are two dictionaries for modules: ``modules`` is used for
    target-independent modules and ``target_modules`` is used for
    target-dependent modules.  When modules are disabled the ``module``
 -  source sets are added to ``softmmu_ss`` and the ``target_modules``
 +  source sets are added to ``system_ss`` and the ``target_modules``
    source sets are added to ``specific_ss``.
    Both dictionaries are nested.  One dictionary is created per
 diff --git a/meson.build b/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/meson.build
 +++ b/meson.build
@@ -XXX,XX +XXX,XX @@ hwcore_ss = ss.source_set()
  io_ss = ss.source_set()
  qmp_ss = ss.source_set()
  qom_ss = ss.source_set()
 -softmmu_ss = ss.source_set()
 +system_ss = ss.source_set()
  specific_fuzz_ss = ss.source_set()
  specific_ss = ss.source_set()
  stub_ss = ss.source_set()
@@ -XXX,XX +XXX,XX @@ if have_block
    # os-posix.c contains POSIX-specific functions used by qemu-storage-daemon,
    # os-win32.c does not
    blockdev_ss.add(when: 'CONFIG_POSIX', if_true: files('os-posix.c'))
 -  softmmu_ss.add(when: 'CONFIG_WIN32', if_true: [files('os-win32.c')])
 +  system_ss.add(when: 'CONFIG_WIN32', if_true: [files('os-win32.c')])
  endif
  common_ss.add(files('cpus-common.c'))
@@ -XXX,XX +XXX,XX @@ foreach d, list : modules
        if d == 'block'
          block_ss.add_all(module_ss)
        else
 -        softmmu_ss.add_all(module_ss)
 +        system_ss.add_all(module_ss)
        endif
      endif
    endforeach
@@ -XXX,XX +XXX,XX @@ libmigration = static_library('migration', sources: migration_files + genh,
                                build_by_default: false)
  migration = declare_dependency(link_with: libmigration,
                                 dependencies: [zlib, qom, io])
 -softmmu_ss.add(migration)
 +system_ss.add(migration)
  block_ss = block_ss.apply(config_host, strict: false)
  libblock = static_library('block', block_ss.sources() + genh,
@@ -XXX,XX +XXX,XX @@ if emulator_modules.length() > 0
    alias_target('modules', emulator_modules)
  endif
 -softmmu_ss.add(authz, blockdev, chardev, crypto, io, qmp)
 +system_ss.add(authz, blockdev, chardev, crypto, io, qmp)
  common_ss.add(qom, qemuutil)
 -common_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: [softmmu_ss])
 +common_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: [system_ss])
  common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss)
  common_all = common_ss.apply(config_all, strict: false)
 diff --git a/accel/meson.build b/accel/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/accel/meson.build
 +++ b/accel/meson.build
@@ -XXX,XX +XXX,XX @@
  specific_ss.add(files('accel-common.c', 'accel-blocker.c'))
 -softmmu_ss.add(files('accel-softmmu.c'))
 +system_ss.add(files('accel-softmmu.c'))
  user_ss.add(files('accel-user.c'))
  subdir('tcg')
@@ -XXX,XX +XXX,XX @@ if have_system
  endif
  # qtest
 -softmmu_ss.add(files('dummy-cpus.c'))
 +system_ss.add(files('dummy-cpus.c'))
 diff --git a/audio/meson.build b/audio/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/audio/meson.build
 +++ b/audio/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add([spice_headers, files('audio.c')])
 -softmmu_ss.add(files(
 +system_ss.add([spice_headers, files('audio.c')])
 +system_ss.add(files(
    'audio-hmp-cmds.c',
    'audio_legacy.c',
    'mixeng.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(files(
    'wavcapture.c',
  ))
 -softmmu_ss.add(when: coreaudio, if_true: files('coreaudio.m'))
 -softmmu_ss.add(when: dsound, if_true: files('dsoundaudio.c', 'audio_win_int.c'))
 +system_ss.add(when: coreaudio, if_true: files('coreaudio.m'))
 +system_ss.add(when: dsound, if_true: files('dsoundaudio.c', 'audio_win_int.c'))
  audio_modules = {}
  foreach m : [
 diff --git a/backends/meson.build b/backends/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/backends/meson.build
 +++ b/backends/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add([files(
 +system_ss.add([files(
    'cryptodev-builtin.c',
    'cryptodev-hmp-cmds.c',
    'cryptodev.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add([files(
    'confidential-guest-support.c',
  ), numa])
 -softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files('rng-random.c'))
 -softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files('hostmem-file.c'))
 -softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('hostmem-memfd.c'))
 +system_ss.add(when: 'CONFIG_POSIX', if_true: files('rng-random.c'))
 +system_ss.add(when: 'CONFIG_POSIX', if_true: files('hostmem-file.c'))
 +system_ss.add(when: 'CONFIG_LINUX', if_true: files('hostmem-memfd.c'))
  if keyutils.found()
 -    softmmu_ss.add(keyutils, files('cryptodev-lkcf.c'))
 +    system_ss.add(keyutils, files('cryptodev-lkcf.c'))
  endif
  if have_vhost_user
 -  softmmu_ss.add(when: 'CONFIG_VIRTIO', if_true: files('vhost-user.c'))
 +  system_ss.add(when: 'CONFIG_VIRTIO', if_true: files('vhost-user.c'))
  endif
 -softmmu_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('cryptodev-vhost.c'))
 +system_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('cryptodev-vhost.c'))
  if have_vhost_user_crypto
 -  softmmu_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('cryptodev-vhost-user.c'))
 +  system_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('cryptodev-vhost-user.c'))
  endif
 -softmmu_ss.add(when: gio, if_true: files('dbus-vmstate.c'))
 -softmmu_ss.add(when: 'CONFIG_SGX', if_true: files('hostmem-epc.c'))
 +system_ss.add(when: gio, if_true: files('dbus-vmstate.c'))
 +system_ss.add(when: 'CONFIG_SGX', if_true: files('hostmem-epc.c'))
  subdir('tpm')
 diff --git a/backends/tpm/meson.build b/backends/tpm/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/backends/tpm/meson.build
 +++ b/backends/tpm/meson.build
@@ -XXX,XX +XXX,XX @@
  if have_tpm
 -  softmmu_ss.add(files('tpm_backend.c'))
 -  softmmu_ss.add(files('tpm_util.c'))
 -  softmmu_ss.add(when: 'CONFIG_TPM_PASSTHROUGH', if_true: files('tpm_passthrough.c'))
 -  softmmu_ss.add(when: 'CONFIG_TPM_EMULATOR', if_true: files('tpm_emulator.c'))
 +  system_ss.add(files('tpm_backend.c'))
 +  system_ss.add(files('tpm_util.c'))
 +  system_ss.add(when: 'CONFIG_TPM_PASSTHROUGH', if_true: files('tpm_passthrough.c'))
 +  system_ss.add(when: 'CONFIG_TPM_EMULATOR', if_true: files('tpm_emulator.c'))
  endif
 diff --git a/block/meson.build b/block/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/block/meson.build
 +++ b/block/meson.build
@@ -XXX,XX +XXX,XX @@ block_ss.add(files(
    'write-threshold.c',
  ), zstd, zlib, gnutls)
 -softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
 -softmmu_ss.add(files('block-ram-registrar.c'))
 +system_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
 +system_ss.add(files('block-ram-registrar.c'))
  if get_option('qcow1').allowed()
    block_ss.add(files('qcow.c'))
@@ -XXX,XX +XXX,XX @@ block_ss.add(block_gen_c)
  block_ss.add(files('stream.c'))
 -softmmu_ss.add(files('qapi-sysemu.c'))
 +system_ss.add(files('qapi-sysemu.c'))
  subdir('export')
  subdir('monitor')
 diff --git a/block/monitor/meson.build b/block/monitor/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/block/monitor/meson.build
 +++ b/block/monitor/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(files('block-hmp-cmds.c'))
 +system_ss.add(files('block-hmp-cmds.c'))
  block_ss.add(files('bitmap-qmp-cmds.c'))
 diff --git a/chardev/meson.build b/chardev/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/chardev/meson.build
 +++ b/chardev/meson.build
@@ -XXX,XX +XXX,XX @@ chardev_ss.add(when: 'CONFIG_WIN32', if_true: files(
  chardev_ss = chardev_ss.apply(config_host, strict: false)
 -softmmu_ss.add(files(
 +system_ss.add(files(
      'char-hmp-cmds.c',
      'msmouse.c',
      'wctablet.c',
 diff --git a/disas/meson.build b/disas/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/disas/meson.build
 +++ b/disas/meson.build
@@ -XXX,XX +XXX,XX @@ common_ss.add(when: 'CONFIG_XTENSA_DIS', if_true: files('xtensa.c'))
  common_ss.add(when: capstone, if_true: [files('capstone.c'), capstone])
  common_ss.add(files('disas.c'))
 -softmmu_ss.add(files('disas-mon.c'))
 +system_ss.add(files('disas-mon.c'))
  specific_ss.add(capstone)
 diff --git a/dump/meson.build b/dump/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/dump/meson.build
 +++ b/dump/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add([files('dump.c', 'dump-hmp-cmds.c'), snappy, lzo])
 +system_ss.add([files('dump.c', 'dump-hmp-cmds.c'), snappy, lzo])
  specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: files('win_dump.c'))
 diff --git a/ebpf/meson.build b/ebpf/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/ebpf/meson.build
 +++ b/ebpf/meson.build
@@ -1 +1 @@
 -softmmu_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c'))
 +system_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c'))
 diff --git a/fsdev/meson.build b/fsdev/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/fsdev/meson.build
 +++ b/fsdev/meson.build
@@ -XXX,XX +XXX,XX @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files(
    '9p-marshal.c',
    'qemu-fsdev.c',
  ), if_false: files('qemu-fsdev-dummy.c'))
 -softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss)
 -softmmu_ss.add_all(when: 'CONFIG_DARWIN', if_true: fsdev_ss)
 +system_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss)
 +system_ss.add_all(when: 'CONFIG_DARWIN', if_true: fsdev_ss)
  if have_virtfs_proxy_helper
    executable('virtfs-proxy-helper',
 diff --git a/gdbstub/meson.build b/gdbstub/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/gdbstub/meson.build
 +++ b/gdbstub/meson.build
@@ -XXX,XX +XXX,XX @@
  # cflags so:
  gdb_user_ss = ss.source_set()
 -gdb_softmmu_ss = ss.source_set()
 +gdb_system_ss = ss.source_set()
  # We build two versions of gdbstub, one for each mode
  gdb_user_ss.add(files('gdbstub.c', 'user.c'))
 -gdb_softmmu_ss.add(files('gdbstub.c', 'softmmu.c'))
 +gdb_system_ss.add(files('gdbstub.c', 'softmmu.c'))
  gdb_user_ss = gdb_user_ss.apply(config_host, strict: false)
 -gdb_softmmu_ss = gdb_softmmu_ss.apply(config_host, strict: false)
 +gdb_system_ss = gdb_system_ss.apply(config_host, strict: false)
  libgdb_user = static_library('gdb_user',
                               gdb_user_ss.sources() + genh,
@@ -XXX,XX +XXX,XX @@ libgdb_user = static_library('gdb_user',
                               build_by_default: have_user)
  libgdb_softmmu = static_library('gdb_softmmu',
 -                                gdb_softmmu_ss.sources() + genh,
 +                                gdb_system_ss.sources() + genh,
                                  name_suffix: 'fa',
                                  build_by_default: have_system)
  gdb_user = declare_dependency(link_whole: libgdb_user)
  user_ss.add(gdb_user)
  gdb_softmmu = declare_dependency(link_whole: libgdb_softmmu)
 -softmmu_ss.add(gdb_softmmu)
 +system_ss.add(gdb_softmmu)
  common_ss.add(files('syscalls.c'))
 diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/9pfs/meson.build
 +++ b/hw/9pfs/meson.build
@@ -XXX,XX +XXX,XX @@ fs_ss.add(files(
  fs_ss.add(when: 'CONFIG_LINUX', if_true: files('9p-util-linux.c'))
  fs_ss.add(when: 'CONFIG_DARWIN', if_true: files('9p-util-darwin.c'))
  fs_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen-9p-backend.c'))
 -softmmu_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss)
 +system_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss)
  specific_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-device.c'))
 diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/acpi/meson.build
 +++ b/hw/acpi/meson.build
@@ -XXX,XX +XXX,XX @@ acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c'))
  if have_tpm
    acpi_ss.add(files('tpm.c'))
  endif
 -softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c', 'acpi_interface.c'))
 -softmmu_ss.add(when: 'CONFIG_ACPI_PCI_BRIDGE', if_false: files('pci-bridge-stub.c'))
 -softmmu_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss)
 -softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c', 'aml-build-stub.c',
 +system_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c', 'acpi_interface.c'))
 +system_ss.add(when: 'CONFIG_ACPI_PCI_BRIDGE', if_false: files('pci-bridge-stub.c'))
 +system_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss)
 +system_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c', 'aml-build-stub.c',
                                                    'acpi-x86-stub.c', 'ipmi-stub.c', 'ghes-stub.c',
                                                    'acpi-mem-hotplug-stub.c', 'acpi-cpu-hotplug-stub.c',
                                                    'acpi-pci-hotplug-stub.c', 'acpi-nvdimm-stub.c',
                                                    'cxl-stub.c', 'pci-bridge-stub.c'))
 -softmmu_ss.add(files('acpi-qmp-cmds.c'))
 +system_ss.add(files('acpi-qmp-cmds.c'))
 diff --git a/hw/adc/meson.build b/hw/adc/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/adc/meson.build
 +++ b/hw/adc/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_STM32F2XX_ADC', if_true: files('stm32f2xx_adc.c'))
 -softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_adc.c'))
 -softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_adc.c'))
 -softmmu_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq-xadc.c'))
 -softmmu_ss.add(when: 'CONFIG_MAX111X', if_true: files('max111x.c'))
 +system_ss.add(when: 'CONFIG_STM32F2XX_ADC', if_true: files('stm32f2xx_adc.c'))
 +system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_adc.c'))
 +system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_adc.c'))
 +system_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq-xadc.c'))
 +system_ss.add(when: 'CONFIG_MAX111X', if_true: files('max111x.c'))
 diff --git a/hw/arm/meson.build b/hw/arm/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/arm/meson.build
 +++ b/hw/arm/meson.build
@@ -XXX,XX +XXX,XX @@ arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c'))
  arm_ss.add(when: 'CONFIG_XEN', if_true: files('xen_arm.c'))
  arm_ss.add_all(xen_ss)
 -softmmu_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c'))
 -softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c'))
 -softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c'))
 -softmmu_ss.add(when: 'CONFIG_TOSA', if_true: files('tosa.c'))
 +system_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c'))
 +system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c'))
 +system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c'))
 +system_ss.add(when: 'CONFIG_TOSA', if_true: files('tosa.c'))
  hw_arch += {'arm': arm_ss}
 diff --git a/hw/audio/meson.build b/hw/audio/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/audio/meson.build
 +++ b/hw/audio/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(files('soundhw.c'))
 -softmmu_ss.add(when: 'CONFIG_AC97', if_true: files('ac97.c'))
 -softmmu_ss.add(when: 'CONFIG_ADLIB', if_true: files('fmopl.c', 'adlib.c'))
 -softmmu_ss.add(when: 'CONFIG_CS4231', if_true: files('cs4231.c'))
 -softmmu_ss.add(when: 'CONFIG_CS4231A', if_true: files('cs4231a.c'))
 -softmmu_ss.add(when: 'CONFIG_ES1370', if_true: files('es1370.c'))
 -softmmu_ss.add(when: 'CONFIG_GUS', if_true: files('gus.c', 'gusemu_hal.c', 'gusemu_mixer.c'))
 -softmmu_ss.add(when: 'CONFIG_HDA', if_true: files('intel-hda.c', 'hda-codec.c'))
 -softmmu_ss.add(when: 'CONFIG_MARVELL_88W8618', if_true: files('marvell_88w8618.c'))
 -softmmu_ss.add(when: 'CONFIG_PCSPK', if_true: files('pcspk.c'))
 -softmmu_ss.add(when: 'CONFIG_PL041', if_true: files('pl041.c', 'lm4549.c'))
 -softmmu_ss.add(when: 'CONFIG_SB16', if_true: files('sb16.c'))
 -softmmu_ss.add(when: 'CONFIG_VT82C686', if_true: files('via-ac97.c'))
 -softmmu_ss.add(when: 'CONFIG_WM8750', if_true: files('wm8750.c'))
 +system_ss.add(files('soundhw.c'))
 +system_ss.add(when: 'CONFIG_AC97', if_true: files('ac97.c'))
 +system_ss.add(when: 'CONFIG_ADLIB', if_true: files('fmopl.c', 'adlib.c'))
 +system_ss.add(when: 'CONFIG_CS4231', if_true: files('cs4231.c'))
 +system_ss.add(when: 'CONFIG_CS4231A', if_true: files('cs4231a.c'))
 +system_ss.add(when: 'CONFIG_ES1370', if_true: files('es1370.c'))
 +system_ss.add(when: 'CONFIG_GUS', if_true: files('gus.c', 'gusemu_hal.c', 'gusemu_mixer.c'))
 +system_ss.add(when: 'CONFIG_HDA', if_true: files('intel-hda.c', 'hda-codec.c'))
 +system_ss.add(when: 'CONFIG_MARVELL_88W8618', if_true: files('marvell_88w8618.c'))
 +system_ss.add(when: 'CONFIG_PCSPK', if_true: files('pcspk.c'))
 +system_ss.add(when: 'CONFIG_PL041', if_true: files('pl041.c', 'lm4549.c'))
 +system_ss.add(when: 'CONFIG_SB16', if_true: files('sb16.c'))
 +system_ss.add(when: 'CONFIG_VT82C686', if_true: files('via-ac97.c'))
 +system_ss.add(when: 'CONFIG_WM8750', if_true: files('wm8750.c'))
 diff --git a/hw/block/meson.build b/hw/block/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/block/meson.build
 +++ b/hw/block/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(files(
 +system_ss.add(files(
    'block.c',
    'cdrom.c',
    'hd-geometry.c'
  ))
 -softmmu_ss.add(when: 'CONFIG_ECC', if_true: files('ecc.c'))
 -softmmu_ss.add(when: 'CONFIG_FDC', if_true: files('fdc.c'))
 -softmmu_ss.add(when: 'CONFIG_FDC_ISA', if_true: files('fdc-isa.c'))
 -softmmu_ss.add(when: 'CONFIG_FDC_SYSBUS', if_true: files('fdc-sysbus.c'))
 -softmmu_ss.add(when: 'CONFIG_NAND', if_true: files('nand.c'))
 -softmmu_ss.add(when: 'CONFIG_ONENAND', if_true: files('onenand.c'))
 -softmmu_ss.add(when: 'CONFIG_PFLASH_CFI01', if_true: files('pflash_cfi01.c'))
 -softmmu_ss.add(when: 'CONFIG_PFLASH_CFI02', if_true: files('pflash_cfi02.c'))
 -softmmu_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('m25p80.c'))
 -softmmu_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('m25p80_sfdp.c'))
 -softmmu_ss.add(when: 'CONFIG_SWIM', if_true: files('swim.c'))
 -softmmu_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen-block.c'))
 -softmmu_ss.add(when: 'CONFIG_TC58128', if_true: files('tc58128.c'))
 +system_ss.add(when: 'CONFIG_ECC', if_true: files('ecc.c'))
 +system_ss.add(when: 'CONFIG_FDC', if_true: files('fdc.c'))
 +system_ss.add(when: 'CONFIG_FDC_ISA', if_true: files('fdc-isa.c'))
 +system_ss.add(when: 'CONFIG_FDC_SYSBUS', if_true: files('fdc-sysbus.c'))
 +system_ss.add(when: 'CONFIG_NAND', if_true: files('nand.c'))
 +system_ss.add(when: 'CONFIG_ONENAND', if_true: files('onenand.c'))
 +system_ss.add(when: 'CONFIG_PFLASH_CFI01', if_true: files('pflash_cfi01.c'))
 +system_ss.add(when: 'CONFIG_PFLASH_CFI02', if_true: files('pflash_cfi02.c'))
 +system_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('m25p80.c'))
 +system_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('m25p80_sfdp.c'))
 +system_ss.add(when: 'CONFIG_SWIM', if_true: files('swim.c'))
 +system_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen-block.c'))
 +system_ss.add(when: 'CONFIG_TC58128', if_true: files('tc58128.c'))
  specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c', 'virtio-blk-common.c'))
  specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk.c', 'virtio-blk-common.c'))
 diff --git a/hw/char/meson.build b/hw/char/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/char/meson.build
 +++ b/hw/char/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_uart.c'))
 -softmmu_ss.add(when: 'CONFIG_CMSDK_APB_UART', if_true: files('cmsdk-apb-uart.c'))
 -softmmu_ss.add(when: 'CONFIG_ESCC', if_true: files('escc.c'))
 -softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_ser.c'))
 -softmmu_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_apbuart.c'))
 -softmmu_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_uart.c'))
 -softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_serial.c'))
 -softmmu_ss.add(when: 'CONFIG_IPACK', if_true: files('ipoctal232.c'))
 -softmmu_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('parallel-isa.c'))
 -softmmu_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugcon.c'))
 -softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_uart.c'))
 -softmmu_ss.add(when: 'CONFIG_PARALLEL', if_true: files('parallel.c'))
 -softmmu_ss.add(when: 'CONFIG_PL011', if_true: files('pl011.c'))
 -softmmu_ss.add(when: 'CONFIG_SCLPCONSOLE', if_true: files('sclpconsole.c', 'sclpconsole-lm.c'))
 -softmmu_ss.add(when: 'CONFIG_SERIAL', if_true: files('serial.c'))
 -softmmu_ss.add(when: 'CONFIG_SERIAL_ISA', if_true: files('serial-isa.c'))
 -softmmu_ss.add(when: 'CONFIG_SERIAL_PCI', if_true: files('serial-pci.c'))
 -softmmu_ss.add(when: 'CONFIG_SERIAL_PCI_MULTI', if_true: files('serial-pci-multi.c'))
 -softmmu_ss.add(when: 'CONFIG_SHAKTI_UART', if_true: files('shakti_uart.c'))
 -softmmu_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-console.c'))
 -softmmu_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen_console.c'))
 -softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_uartlite.c'))
 +system_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_uart.c'))
 +system_ss.add(when: 'CONFIG_CMSDK_APB_UART', if_true: files('cmsdk-apb-uart.c'))
 +system_ss.add(when: 'CONFIG_ESCC', if_true: files('escc.c'))
 +system_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_ser.c'))
 +system_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_apbuart.c'))
 +system_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_uart.c'))
 +system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_serial.c'))
 +system_ss.add(when: 'CONFIG_IPACK', if_true: files('ipoctal232.c'))
 +system_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('parallel-isa.c'))
 +system_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugcon.c'))
 +system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_uart.c'))
 +system_ss.add(when: 'CONFIG_PARALLEL', if_true: files('parallel.c'))
 +system_ss.add(when: 'CONFIG_PL011', if_true: files('pl011.c'))
 +system_ss.add(when: 'CONFIG_SCLPCONSOLE', if_true: files('sclpconsole.c', 'sclpconsole-lm.c'))
 +system_ss.add(when: 'CONFIG_SERIAL', if_true: files('serial.c'))
 +system_ss.add(when: 'CONFIG_SERIAL_ISA', if_true: files('serial-isa.c'))
 +system_ss.add(when: 'CONFIG_SERIAL_PCI', if_true: files('serial-pci.c'))
 +system_ss.add(when: 'CONFIG_SERIAL_PCI_MULTI', if_true: files('serial-pci-multi.c'))
 +system_ss.add(when: 'CONFIG_SHAKTI_UART', if_true: files('shakti_uart.c'))
 +system_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-console.c'))
 +system_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen_console.c'))
 +system_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_uartlite.c'))
 -softmmu_ss.add(when: 'CONFIG_AVR_USART', if_true: files('avr_usart.c'))
 -softmmu_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_uart.c'))
 -softmmu_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic-uart.c'))
 -softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_uart.c'))
 -softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_uart.c'))
 -softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_aux.c'))
 -softmmu_ss.add(when: 'CONFIG_RENESAS_SCI', if_true: files('renesas_sci.c'))
 -softmmu_ss.add(when: 'CONFIG_SIFIVE_UART', if_true: files('sifive_uart.c'))
 -softmmu_ss.add(when: 'CONFIG_SH_SCI', if_true: files('sh_serial.c'))
 -softmmu_ss.add(when: 'CONFIG_STM32F2XX_USART', if_true: files('stm32f2xx_usart.c'))
 -softmmu_ss.add(when: 'CONFIG_MCHP_PFSOC_MMUART', if_true: files('mchp_pfsoc_mmuart.c'))
 -softmmu_ss.add(when: 'CONFIG_HTIF', if_true: files('riscv_htif.c'))
 -softmmu_ss.add(when: 'CONFIG_GOLDFISH_TTY', if_true: files('goldfish_tty.c'))
 +system_ss.add(when: 'CONFIG_AVR_USART', if_true: files('avr_usart.c'))
 +system_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_uart.c'))
 +system_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic-uart.c'))
 +system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_uart.c'))
 +system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_uart.c'))
 +system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_aux.c'))
 +system_ss.add(when: 'CONFIG_RENESAS_SCI', if_true: files('renesas_sci.c'))
 +system_ss.add(when: 'CONFIG_SIFIVE_UART', if_true: files('sifive_uart.c'))
 +system_ss.add(when: 'CONFIG_SH_SCI', if_true: files('sh_serial.c'))
 +system_ss.add(when: 'CONFIG_STM32F2XX_USART', if_true: files('stm32f2xx_usart.c'))
 +system_ss.add(when: 'CONFIG_MCHP_PFSOC_MMUART', if_true: files('mchp_pfsoc_mmuart.c'))
 +system_ss.add(when: 'CONFIG_HTIF', if_true: files('riscv_htif.c'))
 +system_ss.add(when: 'CONFIG_GOLDFISH_TTY', if_true: files('goldfish_tty.c'))
  specific_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('terminal3270.c'))
  specific_ss.add(when: 'CONFIG_VIRTIO', if_true: files('virtio-serial-bus.c'))
 diff --git a/hw/core/meson.build b/hw/core/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/core/meson.build
 +++ b/hw/core/meson.build
@@ -XXX,XX +XXX,XX @@ endif
  common_ss.add(files('cpu-common.c'))
  common_ss.add(files('machine-smp.c'))
 -softmmu_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c'))
 -softmmu_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c'))
 -softmmu_ss.add(when: ['CONFIG_GUEST_LOADER', fdt], if_true: files('guest-loader.c'))
 -softmmu_ss.add(when: 'CONFIG_OR_IRQ', if_true: files('or-irq.c'))
 -softmmu_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('platform-bus.c'))
 -softmmu_ss.add(when: 'CONFIG_PTIMER', if_true: files('ptimer.c'))
 -softmmu_ss.add(when: 'CONFIG_REGISTER', if_true: files('register.c'))
 -softmmu_ss.add(when: 'CONFIG_SPLIT_IRQ', if_true: files('split-irq.c'))
 -softmmu_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c'))
 -softmmu_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('sysbus-fdt.c'))
 +system_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c'))
 +system_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c'))
 +system_ss.add(when: ['CONFIG_GUEST_LOADER', fdt], if_true: files('guest-loader.c'))
 +system_ss.add(when: 'CONFIG_OR_IRQ', if_true: files('or-irq.c'))
 +system_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('platform-bus.c'))
 +system_ss.add(when: 'CONFIG_PTIMER', if_true: files('ptimer.c'))
 +system_ss.add(when: 'CONFIG_REGISTER', if_true: files('register.c'))
 +system_ss.add(when: 'CONFIG_SPLIT_IRQ', if_true: files('split-irq.c'))
 +system_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c'))
 +system_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('sysbus-fdt.c'))
 -softmmu_ss.add(files(
 +system_ss.add(files(
    'cpu-sysemu.c',
    'fw-path-provider.c',
    'gpio.c',
 diff --git a/hw/cpu/meson.build b/hw/cpu/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/cpu/meson.build
 +++ b/hw/cpu/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(files('core.c', 'cluster.c'))
 +system_ss.add(files('core.c', 'cluster.c'))
 -softmmu_ss.add(when: 'CONFIG_ARM11MPCORE', if_true: files('arm11mpcore.c'))
 -softmmu_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_mpcore.c'))
 +system_ss.add(when: 'CONFIG_ARM11MPCORE', if_true: files('arm11mpcore.c'))
 +system_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_mpcore.c'))
  specific_ss.add(when: 'CONFIG_A9MPCORE', if_true: files('a9mpcore.c'))
  specific_ss.add(when: 'CONFIG_A15MPCORE', if_true: files('a15mpcore.c'))
 diff --git a/hw/cxl/meson.build b/hw/cxl/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/cxl/meson.build
 +++ b/hw/cxl/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_CXL',
 +system_ss.add(when: 'CONFIG_CXL',
                 if_true: files(
                     'cxl-component-utils.c',
                     'cxl-device-utils.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(when: 'CONFIG_CXL',
                     'cxl-host-stubs.c',
                 ))
 -softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('cxl-host-stubs.c'))
 +system_ss.add(when: 'CONFIG_ALL', if_true: files('cxl-host-stubs.c'))
 diff --git a/hw/display/meson.build b/hw/display/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/display/meson.build
 +++ b/hw/display/meson.build
@@ -XXX,XX +XXX,XX @@
  hw_display_modules = {}
 -softmmu_ss.add(when: 'CONFIG_DDC', if_true: files('i2c-ddc.c'))
 -softmmu_ss.add(when: 'CONFIG_EDID', if_true: files('edid-generate.c', 'edid-region.c'))
 +system_ss.add(when: 'CONFIG_DDC', if_true: files('i2c-ddc.c'))
 +system_ss.add(when: 'CONFIG_EDID', if_true: files('edid-generate.c', 'edid-region.c'))
 -softmmu_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb.c'))
 -softmmu_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb-standalone.c'))
 +system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb.c'))
 +system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb-standalone.c'))
 -softmmu_ss.add(when: 'CONFIG_VGA_CIRRUS', if_true: files('cirrus_vga.c'))
 -softmmu_ss.add(when: ['CONFIG_VGA_CIRRUS', 'CONFIG_VGA_ISA'], if_true: files('cirrus_vga_isa.c'))
 -softmmu_ss.add(when: 'CONFIG_G364FB', if_true: files('g364fb.c'))
 -softmmu_ss.add(when: 'CONFIG_JAZZ_LED', if_true: files('jazz_led.c'))
 -softmmu_ss.add(when: 'CONFIG_PL110', if_true: files('pl110.c'))
 -softmmu_ss.add(when: 'CONFIG_SII9022', if_true: files('sii9022.c'))
 -softmmu_ss.add(when: 'CONFIG_SSD0303', if_true: files('ssd0303.c'))
 -softmmu_ss.add(when: 'CONFIG_SSD0323', if_true: files('ssd0323.c'))
 -softmmu_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xenfb.c'))
 +system_ss.add(when: 'CONFIG_VGA_CIRRUS', if_true: files('cirrus_vga.c'))
 +system_ss.add(when: ['CONFIG_VGA_CIRRUS', 'CONFIG_VGA_ISA'], if_true: files('cirrus_vga_isa.c'))
 +system_ss.add(when: 'CONFIG_G364FB', if_true: files('g364fb.c'))
 +system_ss.add(when: 'CONFIG_JAZZ_LED', if_true: files('jazz_led.c'))
 +system_ss.add(when: 'CONFIG_PL110', if_true: files('pl110.c'))
 +system_ss.add(when: 'CONFIG_SII9022', if_true: files('sii9022.c'))
 +system_ss.add(when: 'CONFIG_SSD0303', if_true: files('ssd0303.c'))
 +system_ss.add(when: 'CONFIG_SSD0323', if_true: files('ssd0323.c'))
 +system_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xenfb.c'))
 -softmmu_ss.add(when: 'CONFIG_VGA_PCI', if_true: files('vga-pci.c'))
 -softmmu_ss.add(when: 'CONFIG_VGA_ISA', if_true: files('vga-isa.c'))
 -softmmu_ss.add(when: 'CONFIG_VGA_MMIO', if_true: files('vga-mmio.c'))
 -softmmu_ss.add(when: 'CONFIG_VMWARE_VGA', if_true: files('vmware_vga.c'))
 -softmmu_ss.add(when: 'CONFIG_BOCHS_DISPLAY', if_true: files('bochs-display.c'))
 +system_ss.add(when: 'CONFIG_VGA_PCI', if_true: files('vga-pci.c'))
 +system_ss.add(when: 'CONFIG_VGA_ISA', if_true: files('vga-isa.c'))
 +system_ss.add(when: 'CONFIG_VGA_MMIO', if_true: files('vga-mmio.c'))
 +system_ss.add(when: 'CONFIG_VMWARE_VGA', if_true: files('vmware_vga.c'))
 +system_ss.add(when: 'CONFIG_BOCHS_DISPLAY', if_true: files('bochs-display.c'))
 -softmmu_ss.add(when: 'CONFIG_BLIZZARD', if_true: files('blizzard.c'))
 -softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_fimd.c'))
 -softmmu_ss.add(when: 'CONFIG_FRAMEBUFFER', if_true: files('framebuffer.c'))
 -softmmu_ss.add(when: 'CONFIG_ZAURUS', if_true: files('tc6393xb.c'))
 +system_ss.add(when: 'CONFIG_BLIZZARD', if_true: files('blizzard.c'))
 +system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_fimd.c'))
 +system_ss.add(when: 'CONFIG_FRAMEBUFFER', if_true: files('framebuffer.c'))
 +system_ss.add(when: 'CONFIG_ZAURUS', if_true: files('tc6393xb.c'))
 -softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dss.c'))
 -softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_lcd.c'))
 -softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_fb.c'))
 -softmmu_ss.add(when: 'CONFIG_SM501', if_true: files('sm501.c'))
 -softmmu_ss.add(when: 'CONFIG_TCX', if_true: files('tcx.c'))
 -softmmu_ss.add(when: 'CONFIG_CG3', if_true: files('cg3.c'))
 -softmmu_ss.add(when: 'CONFIG_MACFB', if_true: files('macfb.c'))
 -softmmu_ss.add(when: 'CONFIG_NEXTCUBE', if_true: files('next-fb.c'))
 +system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dss.c'))
 +system_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_lcd.c'))
 +system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_fb.c'))
 +system_ss.add(when: 'CONFIG_SM501', if_true: files('sm501.c'))
 +system_ss.add(when: 'CONFIG_TCX', if_true: files('tcx.c'))
 +system_ss.add(when: 'CONFIG_CG3', if_true: files('cg3.c'))
 +system_ss.add(when: 'CONFIG_MACFB', if_true: files('macfb.c'))
 +system_ss.add(when: 'CONFIG_NEXTCUBE', if_true: files('next-fb.c'))
 -softmmu_ss.add(when: 'CONFIG_VGA', if_true: files('vga.c'))
 +system_ss.add(when: 'CONFIG_VGA', if_true: files('vga.c'))
  if (config_all_devices.has_key('CONFIG_VGA_CIRRUS') or
      config_all_devices.has_key('CONFIG_VGA_PCI') or
      config_all_devices.has_key('CONFIG_VMWARE_VGA') or
      config_all_devices.has_key('CONFIG_ATI_VGA')
     )
 -  softmmu_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
 +  system_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
                                        if_false: files('acpi-vga-stub.c'))
  endif
@@ -XXX,XX +XXX,XX @@ if config_all_devices.has_key('CONFIG_QXL')
    hw_display_modules += {'qxl': qxl_ss}
  endif
 -softmmu_ss.add(when: 'CONFIG_DPCD', if_true: files('dpcd.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dp.c'))
 +system_ss.add(when: 'CONFIG_DPCD', if_true: files('dpcd.c'))
 +system_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dp.c'))
 -softmmu_ss.add(when: 'CONFIG_ARTIST', if_true: files('artist.c'))
 +system_ss.add(when: 'CONFIG_ARTIST', if_true: files('artist.c'))
 -softmmu_ss.add(when: [pixman, 'CONFIG_ATI_VGA'], if_true: files('ati.c', 'ati_2d.c', 'ati_dbg.c'))
 +system_ss.add(when: [pixman, 'CONFIG_ATI_VGA'], if_true: files('ati.c', 'ati_2d.c', 'ati_dbg.c'))
  if config_all_devices.has_key('CONFIG_VIRTIO_GPU')
@@ -XXX,XX +XXX,XX @@ if config_all_devices.has_key('CONFIG_VIRTIO_VGA')
    hw_display_modules += {'virtio-vga-gl': virtio_vga_gl_ss}
  endif
 -softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c'))
 +system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c'))
 -softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-vga-stub.c'))
 +system_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-vga-stub.c'))
  modules += { 'hw-display': hw_display_modules }
 diff --git a/hw/dma/meson.build b/hw/dma/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/dma/meson.build
 +++ b/hw/dma/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_RC4030', if_true: files('rc4030.c'))
 -softmmu_ss.add(when: 'CONFIG_PL080', if_true: files('pl080.c'))
 -softmmu_ss.add(when: 'CONFIG_PL330', if_true: files('pl330.c'))
 -softmmu_ss.add(when: 'CONFIG_I82374', if_true: files('i82374.c'))
 -softmmu_ss.add(when: 'CONFIG_I8257', if_true: files('i8257.c'))
 -softmmu_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('xilinx_axidma.c'))
 -softmmu_ss.add(when: 'CONFIG_ZYNQ_DEVCFG', if_true: files('xlnx-zynq-devcfg.c'))
 -softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_dma.c'))
 -softmmu_ss.add(when: 'CONFIG_STP2000', if_true: files('sparc32_dma.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dpdma.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_ZDMA', if_true: files('xlnx-zdma.c'))
 -softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dma.c', 'soc_dma.c'))
 -softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_dma.c'))
 -softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_dma.c'))
 -softmmu_ss.add(when: 'CONFIG_SIFIVE_PDMA', if_true: files('sifive_pdma.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_CSU_DMA', if_true: files('xlnx_csu_dma.c'))
 +system_ss.add(when: 'CONFIG_RC4030', if_true: files('rc4030.c'))
 +system_ss.add(when: 'CONFIG_PL080', if_true: files('pl080.c'))
 +system_ss.add(when: 'CONFIG_PL330', if_true: files('pl330.c'))
 +system_ss.add(when: 'CONFIG_I82374', if_true: files('i82374.c'))
 +system_ss.add(when: 'CONFIG_I8257', if_true: files('i8257.c'))
 +system_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('xilinx_axidma.c'))
 +system_ss.add(when: 'CONFIG_ZYNQ_DEVCFG', if_true: files('xlnx-zynq-devcfg.c'))
 +system_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_dma.c'))
 +system_ss.add(when: 'CONFIG_STP2000', if_true: files('sparc32_dma.c'))
 +system_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dpdma.c'))
 +system_ss.add(when: 'CONFIG_XLNX_ZDMA', if_true: files('xlnx-zdma.c'))
 +system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dma.c', 'soc_dma.c'))
 +system_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_dma.c'))
 +system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_dma.c'))
 +system_ss.add(when: 'CONFIG_SIFIVE_PDMA', if_true: files('sifive_pdma.c'))
 +system_ss.add(when: 'CONFIG_XLNX_CSU_DMA', if_true: files('xlnx_csu_dma.c'))
 diff --git a/hw/gpio/meson.build b/hw/gpio/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/gpio/meson.build
 +++ b/hw/gpio/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_GPIO_KEY', if_true: files('gpio_key.c'))
 -softmmu_ss.add(when: 'CONFIG_GPIO_MPC8XXX', if_true: files('mpc8xxx.c'))
 -softmmu_ss.add(when: 'CONFIG_GPIO_PWR', if_true: files('gpio_pwr.c'))
 -softmmu_ss.add(when: 'CONFIG_MAX7310', if_true: files('max7310.c'))
 -softmmu_ss.add(when: 'CONFIG_PL061', if_true: files('pl061.c'))
 -softmmu_ss.add(when: 'CONFIG_ZAURUS', if_true: files('zaurus.c'))
 +system_ss.add(when: 'CONFIG_GPIO_KEY', if_true: files('gpio_key.c'))
 +system_ss.add(when: 'CONFIG_GPIO_MPC8XXX', if_true: files('mpc8xxx.c'))
 +system_ss.add(when: 'CONFIG_GPIO_PWR', if_true: files('gpio_pwr.c'))
 +system_ss.add(when: 'CONFIG_MAX7310', if_true: files('max7310.c'))
 +system_ss.add(when: 'CONFIG_PL061', if_true: files('pl061.c'))
 +system_ss.add(when: 'CONFIG_ZAURUS', if_true: files('zaurus.c'))
 -softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpio.c'))
 -softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_gpio.c'))
 -softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_gpio.c'))
 -softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gpio.c'))
 -softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_gpio.c'))
 -softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_gpio.c'))
 -softmmu_ss.add(when: 'CONFIG_SIFIVE_GPIO', if_true: files('sifive_gpio.c'))
 +system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpio.c'))
 +system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_gpio.c'))
 +system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_gpio.c'))
 +system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gpio.c'))
 +system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_gpio.c'))
 +system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_gpio.c'))
 +system_ss.add(when: 'CONFIG_SIFIVE_GPIO', if_true: files('sifive_gpio.c'))
 diff --git a/hw/i2c/meson.build b/hw/i2c/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/i2c/meson.build
 +++ b/hw/i2c/meson.build
@@ -XXX,XX +XXX,XX @@ i2c_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_i2c.c'))
  i2c_ss.add(when: 'CONFIG_PPC4XX', if_true: files('ppc4xx_i2c.c'))
  i2c_ss.add(when: 'CONFIG_PCA954X', if_true: files('i2c_mux_pca954x.c'))
  i2c_ss.add(when: 'CONFIG_PMBUS', if_true: files('pmbus_device.c'))
 -softmmu_ss.add_all(when: 'CONFIG_I2C', if_true: i2c_ss)
 +system_ss.add_all(when: 'CONFIG_I2C', if_true: i2c_ss)
 diff --git a/hw/ide/meson.build b/hw/ide/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/ide/meson.build
 +++ b/hw/ide/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_AHCI', if_true: files('ahci.c'))
 -softmmu_ss.add(when: 'CONFIG_AHCI_ICH9', if_true: files('ich.c'))
 -softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('ahci-allwinner.c'))
 -softmmu_ss.add(when: 'CONFIG_IDE_CMD646', if_true: files('cmd646.c'))
 -softmmu_ss.add(when: 'CONFIG_IDE_CORE', if_true: files('core.c', 'atapi.c'))
 -softmmu_ss.add(when: 'CONFIG_IDE_ISA', if_true: files('isa.c', 'ioport.c'))
 -softmmu_ss.add(when: 'CONFIG_IDE_MACIO', if_true: files('macio.c'))
 -softmmu_ss.add(when: 'CONFIG_IDE_MMIO', if_true: files('mmio.c'))
 -softmmu_ss.add(when: 'CONFIG_IDE_PCI', if_true: files('pci.c'))
 -softmmu_ss.add(when: 'CONFIG_IDE_PIIX', if_true: files('piix.c', 'ioport.c'))
 -softmmu_ss.add(when: 'CONFIG_IDE_QDEV', if_true: files('qdev.c'))
 -softmmu_ss.add(when: 'CONFIG_IDE_SII3112', if_true: files('sii3112.c'))
 -softmmu_ss.add(when: 'CONFIG_IDE_VIA', if_true: files('via.c'))
 -softmmu_ss.add(when: 'CONFIG_MICRODRIVE', if_true: files('microdrive.c'))
 +system_ss.add(when: 'CONFIG_AHCI', if_true: files('ahci.c'))
 +system_ss.add(when: 'CONFIG_AHCI_ICH9', if_true: files('ich.c'))
 +system_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('ahci-allwinner.c'))
 +system_ss.add(when: 'CONFIG_IDE_CMD646', if_true: files('cmd646.c'))
 +system_ss.add(when: 'CONFIG_IDE_CORE', if_true: files('core.c', 'atapi.c'))
 +system_ss.add(when: 'CONFIG_IDE_ISA', if_true: files('isa.c', 'ioport.c'))
 +system_ss.add(when: 'CONFIG_IDE_MACIO', if_true: files('macio.c'))
 +system_ss.add(when: 'CONFIG_IDE_MMIO', if_true: files('mmio.c'))
 +system_ss.add(when: 'CONFIG_IDE_PCI', if_true: files('pci.c'))
 +system_ss.add(when: 'CONFIG_IDE_PIIX', if_true: files('piix.c', 'ioport.c'))
 +system_ss.add(when: 'CONFIG_IDE_QDEV', if_true: files('qdev.c'))
 +system_ss.add(when: 'CONFIG_IDE_SII3112', if_true: files('sii3112.c'))
 +system_ss.add(when: 'CONFIG_IDE_VIA', if_true: files('via.c'))
 +system_ss.add(when: 'CONFIG_MICRODRIVE', if_true: files('microdrive.c'))
 diff --git a/hw/input/meson.build b/hw/input/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/input/meson.build
 +++ b/hw/input/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(files('hid.c'))
 -softmmu_ss.add(when: 'CONFIG_ADB', if_true: files('adb.c', 'adb-mouse.c', 'adb-kbd.c'))
 -softmmu_ss.add(when: 'CONFIG_ADS7846', if_true: files('ads7846.c'))
 -softmmu_ss.add(when: 'CONFIG_LM832X', if_true: files('lm832x.c'))
 -softmmu_ss.add(when: 'CONFIG_PCKBD', if_true: files('pckbd.c'))
 -softmmu_ss.add(when: 'CONFIG_PL050', if_true: files('pl050.c'))
 -softmmu_ss.add(when: 'CONFIG_PS2', if_true: files('ps2.c'))
 -softmmu_ss.add(when: 'CONFIG_STELLARIS_INPUT', if_true: files('stellaris_input.c'))
 -softmmu_ss.add(when: 'CONFIG_TSC2005', if_true: files('tsc2005.c'))
 +system_ss.add(files('hid.c'))
 +system_ss.add(when: 'CONFIG_ADB', if_true: files('adb.c', 'adb-mouse.c', 'adb-kbd.c'))
 +system_ss.add(when: 'CONFIG_ADS7846', if_true: files('ads7846.c'))
 +system_ss.add(when: 'CONFIG_LM832X', if_true: files('lm832x.c'))
 +system_ss.add(when: 'CONFIG_PCKBD', if_true: files('pckbd.c'))
 +system_ss.add(when: 'CONFIG_PL050', if_true: files('pl050.c'))
 +system_ss.add(when: 'CONFIG_PS2', if_true: files('ps2.c'))
 +system_ss.add(when: 'CONFIG_STELLARIS_INPUT', if_true: files('stellaris_input.c'))
 +system_ss.add(when: 'CONFIG_TSC2005', if_true: files('tsc2005.c'))
 -softmmu_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-input.c'))
 -softmmu_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-input-hid.c'))
 -softmmu_ss.add(when: 'CONFIG_VIRTIO_INPUT_HOST', if_true: files('virtio-input-host.c'))
 -softmmu_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user-input.c'))
 +system_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-input.c'))
 +system_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-input-hid.c'))
 +system_ss.add(when: 'CONFIG_VIRTIO_INPUT_HOST', if_true: files('virtio-input-host.c'))
 +system_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user-input.c'))
 -softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_keypad.c'))
 -softmmu_ss.add(when: 'CONFIG_TSC210X', if_true: files('tsc210x.c'))
 -softmmu_ss.add(when: 'CONFIG_LASIPS2', if_true: files('lasips2.c'))
 +system_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_keypad.c'))
 +system_ss.add(when: 'CONFIG_TSC210X', if_true: files('tsc210x.c'))
 +system_ss.add(when: 'CONFIG_LASIPS2', if_true: files('lasips2.c'))
 diff --git a/hw/intc/meson.build b/hw/intc/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/intc/meson.build
 +++ b/hw/intc/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(files('intc.c'))
 -softmmu_ss.add(when: 'CONFIG_ARM_GIC', if_true: files(
 +system_ss.add(files('intc.c'))
 +system_ss.add(when: 'CONFIG_ARM_GIC', if_true: files(
    'arm_gic.c',
    'arm_gic_common.c',
    'arm_gicv2m.c',
    'arm_gicv3_common.c',
    'arm_gicv3_its_common.c',
  ))
 -softmmu_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files(
 +system_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files(
    'arm_gicv3.c',
    'arm_gicv3_dist.c',
    'arm_gicv3_its.c',
    'arm_gicv3_redist.c',
  ))
 -softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10_PIC', if_true: files('allwinner-a10-pic.c'))
 -softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_vic.c'))
 -softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_pic.c'))
 -softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_gic.c', 'exynos4210_combiner.c'))
 -softmmu_ss.add(when: 'CONFIG_GOLDFISH_PIC', if_true: files('goldfish_pic.c'))
 -softmmu_ss.add(when: 'CONFIG_HEATHROW_PIC', if_true: files('heathrow_pic.c'))
 -softmmu_ss.add(when: 'CONFIG_I8259', if_true: files('i8259_common.c', 'i8259.c'))
 -softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_avic.c', 'imx_gpcv2.c'))
 -softmmu_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic_common.c'))
 -softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_intc.c'))
 -softmmu_ss.add(when: 'CONFIG_OPENPIC', if_true: files('openpic.c'))
 -softmmu_ss.add(when: 'CONFIG_PL190', if_true: files('pl190.c'))
 -softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_ic.c', 'bcm2836_control.c'))
 -softmmu_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_gic.c'))
 -softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_intctl.c'))
 -softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_intc.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-ipi.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_PMU', if_true: files('xlnx-pmu-iomod-intc.c'))
 +system_ss.add(when: 'CONFIG_ALLWINNER_A10_PIC', if_true: files('allwinner-a10-pic.c'))
 +system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_vic.c'))
 +system_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_pic.c'))
 +system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_gic.c', 'exynos4210_combiner.c'))
 +system_ss.add(when: 'CONFIG_GOLDFISH_PIC', if_true: files('goldfish_pic.c'))
 +system_ss.add(when: 'CONFIG_HEATHROW_PIC', if_true: files('heathrow_pic.c'))
 +system_ss.add(when: 'CONFIG_I8259', if_true: files('i8259_common.c', 'i8259.c'))
 +system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_avic.c', 'imx_gpcv2.c'))
 +system_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic_common.c'))
 +system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_intc.c'))
 +system_ss.add(when: 'CONFIG_OPENPIC', if_true: files('openpic.c'))
 +system_ss.add(when: 'CONFIG_PL190', if_true: files('pl190.c'))
 +system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_ic.c', 'bcm2836_control.c'))
 +system_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_gic.c'))
 +system_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_intctl.c'))
 +system_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_intc.c'))
 +system_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-ipi.c'))
 +system_ss.add(when: 'CONFIG_XLNX_ZYNQMP_PMU', if_true: files('xlnx-pmu-iomod-intc.c'))
  if config_all_devices.has_key('CONFIG_APIC') or \
     config_all_devices.has_key('CONFIG_I8259') or \
     config_all_devices.has_key('CONFIG_MC146818RTC')
 -    softmmu_ss.add(files('kvm_irqcount.c'))
 +    system_ss.add(files('kvm_irqcount.c'))
  endif
  specific_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c', 'apic_common.c'))
 diff --git a/hw/ipack/meson.build b/hw/ipack/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/ipack/meson.build
 +++ b/hw/ipack/meson.build
@@ -1 +1 @@
 -softmmu_ss.add(when: 'CONFIG_IPACK', if_true: files('ipack.c', 'tpci200.c'))
 +system_ss.add(when: 'CONFIG_IPACK', if_true: files('ipack.c', 'tpci200.c'))
 diff --git a/hw/ipmi/meson.build b/hw/ipmi/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/ipmi/meson.build
 +++ b/hw/ipmi/meson.build
@@ -XXX,XX +XXX,XX @@ ipmi_ss.add(when: 'CONFIG_ISA_IPMI_BT', if_true: files('isa_ipmi_bt.c'))
  ipmi_ss.add(when: 'CONFIG_PCI_IPMI_BT', if_true: files('pci_ipmi_bt.c'))
  ipmi_ss.add(when: 'CONFIG_IPMI_SSIF', if_true: files('smbus_ipmi.c'))
 -softmmu_ss.add_all(when: 'CONFIG_IPMI', if_true: ipmi_ss)
 +system_ss.add_all(when: 'CONFIG_IPMI', if_true: ipmi_ss)
 diff --git a/hw/isa/meson.build b/hw/isa/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/isa/meson.build
 +++ b/hw/isa/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_APM', if_true: files('apm.c'))
 -softmmu_ss.add(when: 'CONFIG_I82378', if_true: files('i82378.c'))
 -softmmu_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('isa-bus.c'))
 -softmmu_ss.add(when: 'CONFIG_ISA_SUPERIO', if_true: files('isa-superio.c'))
 -softmmu_ss.add(when: 'CONFIG_PC87312', if_true: files('pc87312.c'))
 -softmmu_ss.add(when: 'CONFIG_PIIX3', if_true: files('piix3.c'))
 -softmmu_ss.add(when: 'CONFIG_PIIX4', if_true: files('piix4.c'))
 -softmmu_ss.add(when: 'CONFIG_SMC37C669', if_true: files('smc37c669-superio.c'))
 -softmmu_ss.add(when: 'CONFIG_VT82C686', if_true: files('vt82c686.c'))
 +system_ss.add(when: 'CONFIG_APM', if_true: files('apm.c'))
 +system_ss.add(when: 'CONFIG_I82378', if_true: files('i82378.c'))
 +system_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('isa-bus.c'))
 +system_ss.add(when: 'CONFIG_ISA_SUPERIO', if_true: files('isa-superio.c'))
 +system_ss.add(when: 'CONFIG_PC87312', if_true: files('pc87312.c'))
 +system_ss.add(when: 'CONFIG_PIIX3', if_true: files('piix3.c'))
 +system_ss.add(when: 'CONFIG_PIIX4', if_true: files('piix4.c'))
 +system_ss.add(when: 'CONFIG_SMC37C669', if_true: files('smc37c669-superio.c'))
 +system_ss.add(when: 'CONFIG_VT82C686', if_true: files('vt82c686.c'))
  specific_ss.add(when: 'CONFIG_LPC_ICH9', if_true: files('lpc_ich9.c'))
 diff --git a/hw/mem/meson.build b/hw/mem/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/mem/meson.build
 +++ b/hw/mem/meson.build
@@ -XXX,XX +XXX,XX @@ mem_ss.add(when: 'CONFIG_DIMM', if_true: files('pc-dimm.c'))
  mem_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_mc.c'))
  mem_ss.add(when: 'CONFIG_NVDIMM', if_true: files('nvdimm.c'))
  mem_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_true: files('cxl_type3.c'))
 -softmmu_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_false: files('cxl_type3_stubs.c'))
 -softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('cxl_type3_stubs.c'))
 +system_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_false: files('cxl_type3_stubs.c'))
 +system_ss.add(when: 'CONFIG_ALL', if_true: files('cxl_type3_stubs.c'))
 -softmmu_ss.add_all(when: 'CONFIG_MEM_DEVICE', if_true: mem_ss)
 +system_ss.add_all(when: 'CONFIG_MEM_DEVICE', if_true: mem_ss)
 -softmmu_ss.add(when: 'CONFIG_SPARSE_MEM', if_true: files('sparse-mem.c'))
 +system_ss.add(when: 'CONFIG_SPARSE_MEM', if_true: files('sparse-mem.c'))
 diff --git a/hw/misc/macio/meson.build b/hw/misc/macio/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/misc/macio/meson.build
 +++ b/hw/misc/macio/meson.build
@@ -XXX,XX +XXX,XX @@ macio_ss.add(when: 'CONFIG_MACIO_GPIO', if_true: files('gpio.c'))
  macio_ss.add(when: 'CONFIG_MAC_DBDMA', if_true: files('mac_dbdma.c'))
  macio_ss.add(when: 'CONFIG_MAC_PMU', if_true: files('pmu.c'))
 -softmmu_ss.add_all(when: 'CONFIG_MACIO', if_true: macio_ss)
 +system_ss.add_all(when: 'CONFIG_MACIO', if_true: macio_ss)
 diff --git a/hw/misc/meson.build b/hw/misc/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/misc/meson.build
 +++ b/hw/misc/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_APPLESMC', if_true: files('applesmc.c'))
 -softmmu_ss.add(when: 'CONFIG_EDU', if_true: files('edu.c'))
 -softmmu_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('vmcoreinfo.c'))
 -softmmu_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugexit.c'))
 -softmmu_ss.add(when: 'CONFIG_ISA_TESTDEV', if_true: files('pc-testdev.c'))
 -softmmu_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c'))
 -softmmu_ss.add(when: 'CONFIG_PCI_TESTDEV', if_true: files('pci-testdev.c'))
 -softmmu_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c'))
 -softmmu_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c'))
 -softmmu_ss.add(when: 'CONFIG_LED', if_true: files('led.c'))
 -softmmu_ss.add(when: 'CONFIG_PVPANIC_COMMON', if_true: files('pvpanic.c'))
 +system_ss.add(when: 'CONFIG_APPLESMC', if_true: files('applesmc.c'))
 +system_ss.add(when: 'CONFIG_EDU', if_true: files('edu.c'))
 +system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('vmcoreinfo.c'))
 +system_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugexit.c'))
 +system_ss.add(when: 'CONFIG_ISA_TESTDEV', if_true: files('pc-testdev.c'))
 +system_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c'))
 +system_ss.add(when: 'CONFIG_PCI_TESTDEV', if_true: files('pci-testdev.c'))
 +system_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c'))
 +system_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c'))
 +system_ss.add(when: 'CONFIG_LED', if_true: files('led.c'))
 +system_ss.add(when: 'CONFIG_PVPANIC_COMMON', if_true: files('pvpanic.c'))
  # ARM devices
 -softmmu_ss.add(when: 'CONFIG_PL310', if_true: files('arm_l2x0.c'))
 -softmmu_ss.add(when: 'CONFIG_INTEGRATOR_DEBUG', if_true: files('arm_integrator_debug.c'))
 -softmmu_ss.add(when: 'CONFIG_A9SCU', if_true: files('a9scu.c'))
 -softmmu_ss.add(when: 'CONFIG_ARM11SCU', if_true: files('arm11scu.c'))
 +system_ss.add(when: 'CONFIG_PL310', if_true: files('arm_l2x0.c'))
 +system_ss.add(when: 'CONFIG_INTEGRATOR_DEBUG', if_true: files('arm_integrator_debug.c'))
 +system_ss.add(when: 'CONFIG_A9SCU', if_true: files('a9scu.c'))
 +system_ss.add(when: 'CONFIG_ARM11SCU', if_true: files('arm11scu.c'))
 -softmmu_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_ras.c'))
 +system_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_ras.c'))
  # Mac devices
 -softmmu_ss.add(when: 'CONFIG_MOS6522', if_true: files('mos6522.c'))
 +system_ss.add(when: 'CONFIG_MOS6522', if_true: files('mos6522.c'))
  # virt devices
 -softmmu_ss.add(when: 'CONFIG_VIRT_CTRL', if_true: files('virt_ctrl.c'))
 +system_ss.add(when: 'CONFIG_VIRT_CTRL', if_true: files('virt_ctrl.c'))
  # RISC-V devices
 -softmmu_ss.add(when: 'CONFIG_MCHP_PFSOC_DMC', if_true: files('mchp_pfsoc_dmc.c'))
 -softmmu_ss.add(when: 'CONFIG_MCHP_PFSOC_IOSCB', if_true: files('mchp_pfsoc_ioscb.c'))
 -softmmu_ss.add(when: 'CONFIG_MCHP_PFSOC_SYSREG', if_true: files('mchp_pfsoc_sysreg.c'))
 -softmmu_ss.add(when: 'CONFIG_SIFIVE_TEST', if_true: files('sifive_test.c'))
 -softmmu_ss.add(when: 'CONFIG_SIFIVE_E_PRCI', if_true: files('sifive_e_prci.c'))
 -softmmu_ss.add(when: 'CONFIG_SIFIVE_U_OTP', if_true: files('sifive_u_otp.c'))
 -softmmu_ss.add(when: 'CONFIG_SIFIVE_U_PRCI', if_true: files('sifive_u_prci.c'))
 +system_ss.add(when: 'CONFIG_MCHP_PFSOC_DMC', if_true: files('mchp_pfsoc_dmc.c'))
 +system_ss.add(when: 'CONFIG_MCHP_PFSOC_IOSCB', if_true: files('mchp_pfsoc_ioscb.c'))
 +system_ss.add(when: 'CONFIG_MCHP_PFSOC_SYSREG', if_true: files('mchp_pfsoc_sysreg.c'))
 +system_ss.add(when: 'CONFIG_SIFIVE_TEST', if_true: files('sifive_test.c'))
 +system_ss.add(when: 'CONFIG_SIFIVE_E_PRCI', if_true: files('sifive_e_prci.c'))
 +system_ss.add(when: 'CONFIG_SIFIVE_U_OTP', if_true: files('sifive_u_otp.c'))
 +system_ss.add(when: 'CONFIG_SIFIVE_U_PRCI', if_true: files('sifive_u_prci.c'))
  subdir('macio')
 -softmmu_ss.add(when: 'CONFIG_IVSHMEM_DEVICE', if_true: files('ivshmem.c'))
 +system_ss.add(when: 'CONFIG_IVSHMEM_DEVICE', if_true: files('ivshmem.c'))
 -softmmu_ss.add(when: 'CONFIG_ALLWINNER_SRAMC', if_true: files('allwinner-sramc.c'))
 -softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10_CCM', if_true: files('allwinner-a10-ccm.c'))
 -softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10_DRAMC', if_true: files('allwinner-a10-dramc.c'))
 -softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-ccu.c'))
 +system_ss.add(when: 'CONFIG_ALLWINNER_SRAMC', if_true: files('allwinner-sramc.c'))
 +system_ss.add(when: 'CONFIG_ALLWINNER_A10_CCM', if_true: files('allwinner-a10-ccm.c'))
 +system_ss.add(when: 'CONFIG_ALLWINNER_A10_DRAMC', if_true: files('allwinner-a10-dramc.c'))
 +system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-ccu.c'))
  specific_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-cpucfg.c'))
 -softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-dramc.c'))
 -softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-sysctrl.c'))
 -softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sid.c'))
 -softmmu_ss.add(when: 'CONFIG_ALLWINNER_R40', if_true: files('allwinner-r40-ccu.c'))
 -softmmu_ss.add(when: 'CONFIG_ALLWINNER_R40', if_true: files('allwinner-r40-dramc.c'))
 -softmmu_ss.add(when: 'CONFIG_AXP2XX_PMU', if_true: files('axp2xx.c'))
 -softmmu_ss.add(when: 'CONFIG_REALVIEW', if_true: files('arm_sysctl.c'))
 -softmmu_ss.add(when: 'CONFIG_NSERIES', if_true: files('cbus.c'))
 -softmmu_ss.add(when: 'CONFIG_ECCMEMCTL', if_true: files('eccmemctl.c'))
 -softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pmu.c', 'exynos4210_clk.c', 'exynos4210_rng.c'))
 -softmmu_ss.add(when: 'CONFIG_IMX', if_true: files(
 +system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-dramc.c'))
 +system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-sysctrl.c'))
 +system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sid.c'))
 +system_ss.add(when: 'CONFIG_ALLWINNER_R40', if_true: files('allwinner-r40-ccu.c'))
 +system_ss.add(when: 'CONFIG_ALLWINNER_R40', if_true: files('allwinner-r40-dramc.c'))
 +system_ss.add(when: 'CONFIG_AXP2XX_PMU', if_true: files('axp2xx.c'))
 +system_ss.add(when: 'CONFIG_REALVIEW', if_true: files('arm_sysctl.c'))
 +system_ss.add(when: 'CONFIG_NSERIES', if_true: files('cbus.c'))
 +system_ss.add(when: 'CONFIG_ECCMEMCTL', if_true: files('eccmemctl.c'))
 +system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pmu.c', 'exynos4210_clk.c', 'exynos4210_rng.c'))
 +system_ss.add(when: 'CONFIG_IMX', if_true: files(
    'imx25_ccm.c',
    'imx31_ccm.c',
    'imx6_ccm.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(when: 'CONFIG_IMX', if_true: files(
    'imx_ccm.c',
    'imx_rngc.c',
  ))
 -softmmu_ss.add(when: 'CONFIG_MAINSTONE', if_true: files('mst_fpga.c'))
 -softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files(
 +system_ss.add(when: 'CONFIG_MAINSTONE', if_true: files('mst_fpga.c'))
 +system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files(
    'npcm7xx_clk.c',
    'npcm7xx_gcr.c',
    'npcm7xx_mft.c',
    'npcm7xx_pwm.c',
    'npcm7xx_rng.c',
  ))
 -softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files(
 +system_ss.add(when: 'CONFIG_OMAP', if_true: files(
    'omap_clk.c',
    'omap_gpmc.c',
    'omap_l4.c',
    'omap_sdrc.c',
    'omap_tap.c',
  ))
 -softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files(
 +system_ss.add(when: 'CONFIG_RASPI', if_true: files(
    'bcm2835_mbox.c',
    'bcm2835_mphi.c',
    'bcm2835_property.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files(
    'bcm2835_cprman.c',
    'bcm2835_powermgt.c',
  ))
 -softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_misc.c'))
 -softmmu_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq_slcr.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp-crf.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp-apu-ctrl.c'))
 +system_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_misc.c'))
 +system_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq_slcr.c'))
 +system_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp-crf.c'))
 +system_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp-apu-ctrl.c'))
  specific_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-crl.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files(
 +system_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files(
    'xlnx-versal-xramc.c',
    'xlnx-versal-pmc-iou-slcr.c',
  ))
 -softmmu_ss.add(when: 'CONFIG_STM32F2XX_SYSCFG', if_true: files('stm32f2xx_syscfg.c'))
 -softmmu_ss.add(when: 'CONFIG_STM32F4XX_SYSCFG', if_true: files('stm32f4xx_syscfg.c'))
 -softmmu_ss.add(when: 'CONFIG_STM32F4XX_EXTI', if_true: files('stm32f4xx_exti.c'))
 -softmmu_ss.add(when: 'CONFIG_MPS2_FPGAIO', if_true: files('mps2-fpgaio.c'))
 -softmmu_ss.add(when: 'CONFIG_MPS2_SCC', if_true: files('mps2-scc.c'))
 +system_ss.add(when: 'CONFIG_STM32F2XX_SYSCFG', if_true: files('stm32f2xx_syscfg.c'))
 +system_ss.add(when: 'CONFIG_STM32F4XX_SYSCFG', if_true: files('stm32f4xx_syscfg.c'))
 +system_ss.add(when: 'CONFIG_STM32F4XX_EXTI', if_true: files('stm32f4xx_exti.c'))
 +system_ss.add(when: 'CONFIG_MPS2_FPGAIO', if_true: files('mps2-fpgaio.c'))
 +system_ss.add(when: 'CONFIG_MPS2_SCC', if_true: files('mps2-scc.c'))
 -softmmu_ss.add(when: 'CONFIG_TZ_MPC', if_true: files('tz-mpc.c'))
 -softmmu_ss.add(when: 'CONFIG_TZ_MSC', if_true: files('tz-msc.c'))
 -softmmu_ss.add(when: 'CONFIG_TZ_PPC', if_true: files('tz-ppc.c'))
 -softmmu_ss.add(when: 'CONFIG_IOTKIT_SECCTL', if_true: files('iotkit-secctl.c'))
 -softmmu_ss.add(when: 'CONFIG_IOTKIT_SYSCTL', if_true: files('iotkit-sysctl.c'))
 -softmmu_ss.add(when: 'CONFIG_IOTKIT_SYSINFO', if_true: files('iotkit-sysinfo.c'))
 -softmmu_ss.add(when: 'CONFIG_ARMSSE_CPU_PWRCTRL', if_true: files('armsse-cpu-pwrctrl.c'))
 -softmmu_ss.add(when: 'CONFIG_ARMSSE_CPUID', if_true: files('armsse-cpuid.c'))
 -softmmu_ss.add(when: 'CONFIG_ARMSSE_MHU', if_true: files('armsse-mhu.c'))
 +system_ss.add(when: 'CONFIG_TZ_MPC', if_true: files('tz-mpc.c'))
 +system_ss.add(when: 'CONFIG_TZ_MSC', if_true: files('tz-msc.c'))
 +system_ss.add(when: 'CONFIG_TZ_PPC', if_true: files('tz-ppc.c'))
 +system_ss.add(when: 'CONFIG_IOTKIT_SECCTL', if_true: files('iotkit-secctl.c'))
 +system_ss.add(when: 'CONFIG_IOTKIT_SYSCTL', if_true: files('iotkit-sysctl.c'))
 +system_ss.add(when: 'CONFIG_IOTKIT_SYSINFO', if_true: files('iotkit-sysinfo.c'))
 +system_ss.add(when: 'CONFIG_ARMSSE_CPU_PWRCTRL', if_true: files('armsse-cpu-pwrctrl.c'))
 +system_ss.add(when: 'CONFIG_ARMSSE_CPUID', if_true: files('armsse-cpuid.c'))
 +system_ss.add(when: 'CONFIG_ARMSSE_MHU', if_true: files('armsse-mhu.c'))
 -softmmu_ss.add(when: 'CONFIG_PVPANIC_ISA', if_true: files('pvpanic-isa.c'))
 -softmmu_ss.add(when: 'CONFIG_PVPANIC_PCI', if_true: files('pvpanic-pci.c'))
 -softmmu_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c'))
 -softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files(
 +system_ss.add(when: 'CONFIG_PVPANIC_ISA', if_true: files('pvpanic-isa.c'))
 +system_ss.add(when: 'CONFIG_PVPANIC_PCI', if_true: files('pvpanic-pci.c'))
 +system_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c'))
 +system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files(
    'aspeed_hace.c',
    'aspeed_i3c.c',
    'aspeed_lpc.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files(
    'aspeed_xdma.c',
    'aspeed_peci.c'))
 -softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c'))
 -softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_rng.c'))
 +system_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c'))
 +system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_rng.c'))
 -softmmu_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_ahb_apb_pnp.c'))
 +system_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_ahb_apb_pnp.c'))
 -softmmu_ss.add(when: 'CONFIG_I2C', if_true: files('i2c-echo.c'))
 +system_ss.add(when: 'CONFIG_I2C', if_true: files('i2c-echo.c'))
  specific_ss.add(when: 'CONFIG_AVR_POWER', if_true: files('avr_power.c'))
@@ -XXX,XX +XXX,XX @@ specific_ss.add(when: 'CONFIG_MAC_VIA', if_true: files('mac_via.c'))
  specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_cmgcr.c', 'mips_cpc.c'))
  specific_ss.add(when: 'CONFIG_MIPS_ITU', if_true: files('mips_itu.c'))
 -softmmu_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa_ec.c'))
 +system_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa_ec.c'))
  # HPPA devices
 -softmmu_ss.add(when: 'CONFIG_LASI', if_true: files('lasi.c'))
 +system_ss.add(when: 'CONFIG_LASI', if_true: files('lasi.c'))
 diff --git a/hw/net/can/meson.build b/hw/net/can/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/net/can/meson.build
 +++ b/hw/net/can/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_CAN_SJA1000', if_true: files('can_sja1000.c'))
 -softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_kvaser_pci.c'))
 -softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_pcm3680_pci.c'))
 -softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_mioe3680_pci.c'))
 -softmmu_ss.add(when: 'CONFIG_CAN_CTUCANFD', if_true: files('ctucan_core.c'))
 -softmmu_ss.add(when: 'CONFIG_CAN_CTUCANFD_PCI', if_true: files('ctucan_pci.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-can.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-canfd.c'))
 +system_ss.add(when: 'CONFIG_CAN_SJA1000', if_true: files('can_sja1000.c'))
 +system_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_kvaser_pci.c'))
 +system_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_pcm3680_pci.c'))
 +system_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_mioe3680_pci.c'))
 +system_ss.add(when: 'CONFIG_CAN_CTUCANFD', if_true: files('ctucan_core.c'))
 +system_ss.add(when: 'CONFIG_CAN_CTUCANFD_PCI', if_true: files('ctucan_pci.c'))
 +system_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-can.c'))
 +system_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-canfd.c'))
 diff --git a/hw/net/meson.build b/hw/net/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/net/meson.build
 +++ b/hw/net/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_DP8393X', if_true: files('dp8393x.c'))
 -softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen_nic.c'))
 -softmmu_ss.add(when: 'CONFIG_NE2000_COMMON', if_true: files('ne2000.c'))
 +system_ss.add(when: 'CONFIG_DP8393X', if_true: files('dp8393x.c'))
 +system_ss.add(when: 'CONFIG_XEN', if_true: files('xen_nic.c'))
 +system_ss.add(when: 'CONFIG_NE2000_COMMON', if_true: files('ne2000.c'))
  # PCI network cards
 -softmmu_ss.add(when: 'CONFIG_NE2000_PCI', if_true: files('ne2000-pci.c'))
 -softmmu_ss.add(when: 'CONFIG_EEPRO100_PCI', if_true: files('eepro100.c'))
 -softmmu_ss.add(when: 'CONFIG_PCNET_PCI', if_true: files('pcnet-pci.c'))
 -softmmu_ss.add(when: 'CONFIG_PCNET_COMMON', if_true: files('pcnet.c'))
 -softmmu_ss.add(when: 'CONFIG_E1000_PCI', if_true: files('e1000.c', 'e1000x_common.c'))
 -softmmu_ss.add(when: 'CONFIG_E1000E_PCI_EXPRESS', if_true: files('net_tx_pkt.c', 'net_rx_pkt.c'))
 -softmmu_ss.add(when: 'CONFIG_E1000E_PCI_EXPRESS', if_true: files('e1000e.c', 'e1000e_core.c', 'e1000x_common.c'))
 -softmmu_ss.add(when: 'CONFIG_IGB_PCI_EXPRESS', if_true: files('net_tx_pkt.c', 'net_rx_pkt.c'))
 -softmmu_ss.add(when: 'CONFIG_IGB_PCI_EXPRESS', if_true: files('igb.c', 'igbvf.c', 'igb_core.c'))
 -softmmu_ss.add(when: 'CONFIG_RTL8139_PCI', if_true: files('rtl8139.c'))
 -softmmu_ss.add(when: 'CONFIG_TULIP', if_true: files('tulip.c'))
 -softmmu_ss.add(when: 'CONFIG_VMXNET3_PCI', if_true: files('net_tx_pkt.c', 'net_rx_pkt.c'))
 -softmmu_ss.add(when: 'CONFIG_VMXNET3_PCI', if_true: files('vmxnet3.c'))
 +system_ss.add(when: 'CONFIG_NE2000_PCI', if_true: files('ne2000-pci.c'))
 +system_ss.add(when: 'CONFIG_EEPRO100_PCI', if_true: files('eepro100.c'))
 +system_ss.add(when: 'CONFIG_PCNET_PCI', if_true: files('pcnet-pci.c'))
 +system_ss.add(when: 'CONFIG_PCNET_COMMON', if_true: files('pcnet.c'))
 +system_ss.add(when: 'CONFIG_E1000_PCI', if_true: files('e1000.c', 'e1000x_common.c'))
 +system_ss.add(when: 'CONFIG_E1000E_PCI_EXPRESS', if_true: files('net_tx_pkt.c', 'net_rx_pkt.c'))
 +system_ss.add(when: 'CONFIG_E1000E_PCI_EXPRESS', if_true: files('e1000e.c', 'e1000e_core.c', 'e1000x_common.c'))
 +system_ss.add(when: 'CONFIG_IGB_PCI_EXPRESS', if_true: files('net_tx_pkt.c', 'net_rx_pkt.c'))
 +system_ss.add(when: 'CONFIG_IGB_PCI_EXPRESS', if_true: files('igb.c', 'igbvf.c', 'igb_core.c'))
 +system_ss.add(when: 'CONFIG_RTL8139_PCI', if_true: files('rtl8139.c'))
 +system_ss.add(when: 'CONFIG_TULIP', if_true: files('tulip.c'))
 +system_ss.add(when: 'CONFIG_VMXNET3_PCI', if_true: files('net_tx_pkt.c', 'net_rx_pkt.c'))
 +system_ss.add(when: 'CONFIG_VMXNET3_PCI', if_true: files('vmxnet3.c'))
 -softmmu_ss.add(when: 'CONFIG_SMC91C111', if_true: files('smc91c111.c'))
 -softmmu_ss.add(when: 'CONFIG_LAN9118', if_true: files('lan9118.c'))
 -softmmu_ss.add(when: 'CONFIG_NE2000_ISA', if_true: files('ne2000-isa.c'))
 -softmmu_ss.add(when: 'CONFIG_OPENCORES_ETH', if_true: files('opencores_eth.c'))
 -softmmu_ss.add(when: 'CONFIG_XGMAC', if_true: files('xgmac.c'))
 -softmmu_ss.add(when: 'CONFIG_MIPSNET', if_true: files('mipsnet.c'))
 -softmmu_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('xilinx_axienet.c'))
 -softmmu_ss.add(when: 'CONFIG_ALLWINNER_EMAC', if_true: files('allwinner_emac.c'))
 -softmmu_ss.add(when: 'CONFIG_ALLWINNER_SUN8I_EMAC', if_true: files('allwinner-sun8i-emac.c'))
 -softmmu_ss.add(when: 'CONFIG_IMX_FEC', if_true: files('imx_fec.c'))
 -softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-emac.c'))
 -softmmu_ss.add(when: 'CONFIG_MARVELL_88W8618', if_true: files('mv88w8618_eth.c'))
 +system_ss.add(when: 'CONFIG_SMC91C111', if_true: files('smc91c111.c'))
 +system_ss.add(when: 'CONFIG_LAN9118', if_true: files('lan9118.c'))
 +system_ss.add(when: 'CONFIG_NE2000_ISA', if_true: files('ne2000-isa.c'))
 +system_ss.add(when: 'CONFIG_OPENCORES_ETH', if_true: files('opencores_eth.c'))
 +system_ss.add(when: 'CONFIG_XGMAC', if_true: files('xgmac.c'))
 +system_ss.add(when: 'CONFIG_MIPSNET', if_true: files('mipsnet.c'))
 +system_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('xilinx_axienet.c'))
 +system_ss.add(when: 'CONFIG_ALLWINNER_EMAC', if_true: files('allwinner_emac.c'))
 +system_ss.add(when: 'CONFIG_ALLWINNER_SUN8I_EMAC', if_true: files('allwinner-sun8i-emac.c'))
 +system_ss.add(when: 'CONFIG_IMX_FEC', if_true: files('imx_fec.c'))
 +system_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-emac.c'))
 +system_ss.add(when: 'CONFIG_MARVELL_88W8618', if_true: files('mv88w8618_eth.c'))
 -softmmu_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_gem.c'))
 -softmmu_ss.add(when: 'CONFIG_STELLARIS_ENET', if_true: files('stellaris_enet.c'))
 -softmmu_ss.add(when: 'CONFIG_LANCE', if_true: files('lance.c'))
 -softmmu_ss.add(when: 'CONFIG_LASI_I82596', if_true: files('lasi_i82596.c'))
 -softmmu_ss.add(when: 'CONFIG_I82596_COMMON', if_true: files('i82596.c'))
 -softmmu_ss.add(when: 'CONFIG_SUNHME', if_true: files('sunhme.c'))
 -softmmu_ss.add(when: 'CONFIG_FTGMAC100', if_true: files('ftgmac100.c'))
 -softmmu_ss.add(when: 'CONFIG_SUNGEM', if_true: files('sungem.c'))
 -softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_emc.c'))
 +system_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_gem.c'))
 +system_ss.add(when: 'CONFIG_STELLARIS_ENET', if_true: files('stellaris_enet.c'))
 +system_ss.add(when: 'CONFIG_LANCE', if_true: files('lance.c'))
 +system_ss.add(when: 'CONFIG_LASI_I82596', if_true: files('lasi_i82596.c'))
 +system_ss.add(when: 'CONFIG_I82596_COMMON', if_true: files('i82596.c'))
 +system_ss.add(when: 'CONFIG_SUNHME', if_true: files('sunhme.c'))
 +system_ss.add(when: 'CONFIG_FTGMAC100', if_true: files('ftgmac100.c'))
 +system_ss.add(when: 'CONFIG_SUNGEM', if_true: files('sungem.c'))
 +system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_emc.c'))
 -softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_eth.c'))
 -softmmu_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_fec.c'))
 +system_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_eth.c'))
 +system_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_fec.c'))
  specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_llan.c'))
 -softmmu_ss.add(when: 'CONFIG_XILINX_ETHLITE', if_true: files('xilinx_ethlite.c'))
 +system_ss.add(when: 'CONFIG_XILINX_ETHLITE', if_true: files('xilinx_ethlite.c'))
 -softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('net_rx_pkt.c'))
 +system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('net_rx_pkt.c'))
  specific_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net.c'))
  if have_vhost_net
 -  softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost_net.c'), if_false: files('vhost_net-stub.c'))
 -  softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost_net-stub.c'))
 +  system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost_net.c'), if_false: files('vhost_net-stub.c'))
 +  system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost_net-stub.c'))
  else
 -  softmmu_ss.add(files('vhost_net-stub.c'))
 +  system_ss.add(files('vhost_net-stub.c'))
  endif
 -softmmu_ss.add(when: 'CONFIG_ETSEC', if_true: files(
 +system_ss.add(when: 'CONFIG_ETSEC', if_true: files(
    'fsl_etsec/etsec.c',
    'fsl_etsec/miim.c',
    'fsl_etsec/registers.c',
    'fsl_etsec/rings.c',
  ))
 -softmmu_ss.add(when: 'CONFIG_ROCKER', if_true: files(
 +system_ss.add(when: 'CONFIG_ROCKER', if_true: files(
    'rocker/rocker.c',
    'rocker/rocker_desc.c',
    'rocker/rocker_fp.c',
    'rocker/rocker_of_dpa.c',
    'rocker/rocker_world.c',
  ), if_false: files('rocker/qmp-norocker.c'))
 -softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('rocker/qmp-norocker.c'))
 -softmmu_ss.add(files('rocker/rocker-hmp-cmds.c'))
 +system_ss.add(when: 'CONFIG_ALL', if_true: files('rocker/qmp-norocker.c'))
 +system_ss.add(files('rocker/rocker-hmp-cmds.c'))
  subdir('can')
 diff --git a/hw/nubus/meson.build b/hw/nubus/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/nubus/meson.build
 +++ b/hw/nubus/meson.build
@@ -XXX,XX +XXX,XX @@ nubus_ss.add(files('nubus-bus.c'))
  nubus_ss.add(files('nubus-bridge.c'))
  nubus_ss.add(when: 'CONFIG_Q800', if_true: files('mac-nubus-bridge.c'))
 -softmmu_ss.add_all(when: 'CONFIG_NUBUS', if_true: nubus_ss)
 +system_ss.add_all(when: 'CONFIG_NUBUS', if_true: nubus_ss)
 diff --git a/hw/nvme/meson.build b/hw/nvme/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/nvme/meson.build
 +++ b/hw/nvme/meson.build
@@ -1 +1 @@
 -softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('ctrl.c', 'dif.c', 'ns.c', 'subsys.c'))
 +system_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('ctrl.c', 'dif.c', 'ns.c', 'subsys.c'))
 diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/nvram/meson.build
 +++ b/hw/nvram/meson.build
@@ -XXX,XX +XXX,XX @@ if have_system or have_tools
    qom_ss.add(files('fw_cfg-interface.c'))
  endif
 -softmmu_ss.add(files('fw_cfg.c'))
 -softmmu_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c'))
 -softmmu_ss.add(when: 'CONFIG_DS1225Y', if_true: files('ds1225y.c'))
 -softmmu_ss.add(when: 'CONFIG_NMC93XX_EEPROM', if_true: files('eeprom93xx.c'))
 -softmmu_ss.add(when: 'CONFIG_AT24C', if_true: files('eeprom_at24c.c'))
 -softmmu_ss.add(when: 'CONFIG_MAC_NVRAM', if_true: files('mac_nvram.c'))
 -softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_otp.c'))
 -softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_nvm.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_EFUSE_CRC', if_true: files('xlnx-efuse-crc.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_EFUSE', if_true: files('xlnx-efuse.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_EFUSE_VERSAL', if_true: files(
 +system_ss.add(files('fw_cfg.c'))
 +system_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c'))
 +system_ss.add(when: 'CONFIG_DS1225Y', if_true: files('ds1225y.c'))
 +system_ss.add(when: 'CONFIG_NMC93XX_EEPROM', if_true: files('eeprom93xx.c'))
 +system_ss.add(when: 'CONFIG_AT24C', if_true: files('eeprom_at24c.c'))
 +system_ss.add(when: 'CONFIG_MAC_NVRAM', if_true: files('mac_nvram.c'))
 +system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_otp.c'))
 +system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_nvm.c'))
 +system_ss.add(when: 'CONFIG_XLNX_EFUSE_CRC', if_true: files('xlnx-efuse-crc.c'))
 +system_ss.add(when: 'CONFIG_XLNX_EFUSE', if_true: files('xlnx-efuse.c'))
 +system_ss.add(when: 'CONFIG_XLNX_EFUSE_VERSAL', if_true: files(
                                                     'xlnx-versal-efuse-cache.c',
                                                     'xlnx-versal-efuse-ctrl.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_EFUSE_ZYNQMP', if_true: files(
 +system_ss.add(when: 'CONFIG_XLNX_EFUSE_ZYNQMP', if_true: files(
                                                     'xlnx-zynqmp-efuse.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_BBRAM', if_true: files('xlnx-bbram.c'))
 +system_ss.add(when: 'CONFIG_XLNX_BBRAM', if_true: files('xlnx-bbram.c'))
  specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_nvram.c'))
 diff --git a/hw/pci-bridge/meson.build b/hw/pci-bridge/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/pci-bridge/meson.build
 +++ b/hw/pci-bridge/meson.build
@@ -XXX,XX +XXX,XX @@ pci_ss.add(when: 'CONFIG_CXL', if_true: files('cxl_root_port.c', 'cxl_upstream.c
  # Sun4u
  pci_ss.add(when: 'CONFIG_SIMBA', if_true: files('simba.c'))
 -softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
 +system_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
 -softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('pci_expander_bridge_stubs.c'))
 +system_ss.add(when: 'CONFIG_ALL', if_true: files('pci_expander_bridge_stubs.c'))
 diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/pci-host/meson.build
 +++ b/hw/pci-host/meson.build
@@ -XXX,XX +XXX,XX @@ pci_ss.add(when: 'CONFIG_VERSATILE_PCI', if_true: files('versatile.c'))
  # HPPA devices
  pci_ss.add(when: 'CONFIG_DINO', if_true: files('dino.c'))
 -softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
 +system_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
  specific_ss.add(when: 'CONFIG_PCI_POWERNV', if_true: files(
    'pnv_phb3.c',
 diff --git a/hw/pci/meson.build b/hw/pci/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/pci/meson.build
 +++ b/hw/pci/meson.build
@@ -XXX,XX +XXX,XX @@ pci_ss.add(files(
  # CONFIG_PCI_EXPRESS=n.
  pci_ss.add(files('pcie.c', 'pcie_aer.c'))
  pci_ss.add(files('pcie_doe.c'))
 -softmmu_ss.add(when: 'CONFIG_PCI_EXPRESS', if_true: files('pcie_port.c', 'pcie_host.c'))
 -softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
 +system_ss.add(when: 'CONFIG_PCI_EXPRESS', if_true: files('pcie_port.c', 'pcie_host.c'))
 +system_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
 -softmmu_ss.add(when: 'CONFIG_PCI', if_false: files('pci-stub.c'))
 -softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('pci-stub.c'))
 +system_ss.add(when: 'CONFIG_PCI', if_false: files('pci-stub.c'))
 +system_ss.add(when: 'CONFIG_ALL', if_true: files('pci-stub.c'))
 diff --git a/hw/pcmcia/meson.build b/hw/pcmcia/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/pcmcia/meson.build
 +++ b/hw/pcmcia/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_PCMCIA', if_true: files('pcmcia.c'))
 -softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c'))
 +system_ss.add(when: 'CONFIG_PCMCIA', if_true: files('pcmcia.c'))
 +system_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c'))
 diff --git a/hw/rdma/meson.build b/hw/rdma/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/rdma/meson.build
 +++ b/hw/rdma/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_VMW_PVRDMA', if_true: files(
 +system_ss.add(when: 'CONFIG_VMW_PVRDMA', if_true: files(
    'rdma.c',
    'rdma_backend.c',
    'rdma_utils.c',
 diff --git a/hw/remote/meson.build b/hw/remote/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/remote/meson.build
 +++ b/hw/remote/meson.build
@@ -XXX,XX +XXX,XX @@ remote_ss.add(when: 'CONFIG_VFIO_USER_SERVER', if_true: libvfio_user_dep)
  specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('memory.c'))
  specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('proxy-memory-listener.c'))
 -softmmu_ss.add_all(when: 'CONFIG_MULTIPROCESS', if_true: remote_ss)
 +system_ss.add_all(when: 'CONFIG_MULTIPROCESS', if_true: remote_ss)
 diff --git a/hw/rtc/meson.build b/hw/rtc/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/rtc/meson.build
 +++ b/hw/rtc/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_DS1338', if_true: files('ds1338.c'))
 -softmmu_ss.add(when: 'CONFIG_M41T80', if_true: files('m41t80.c'))
 -softmmu_ss.add(when: 'CONFIG_M48T59', if_true: files('m48t59.c'))
 -softmmu_ss.add(when: 'CONFIG_PL031', if_true: files('pl031.c'))
 -softmmu_ss.add(when: 'CONFIG_TWL92230', if_true: files('twl92230.c'))
 -softmmu_ss.add(when: ['CONFIG_ISA_BUS', 'CONFIG_M48T59'], if_true: files('m48t59-isa.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-rtc.c'))
 +system_ss.add(when: 'CONFIG_DS1338', if_true: files('ds1338.c'))
 +system_ss.add(when: 'CONFIG_M41T80', if_true: files('m41t80.c'))
 +system_ss.add(when: 'CONFIG_M48T59', if_true: files('m48t59.c'))
 +system_ss.add(when: 'CONFIG_PL031', if_true: files('pl031.c'))
 +system_ss.add(when: 'CONFIG_TWL92230', if_true: files('twl92230.c'))
 +system_ss.add(when: ['CONFIG_ISA_BUS', 'CONFIG_M48T59'], if_true: files('m48t59-isa.c'))
 +system_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-rtc.c'))
 -softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_rtc.c'))
 -softmmu_ss.add(when: 'CONFIG_SUN4V_RTC', if_true: files('sun4v-rtc.c'))
 -softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_rtc.c'))
 -softmmu_ss.add(when: 'CONFIG_GOLDFISH_RTC', if_true: files('goldfish_rtc.c'))
 -softmmu_ss.add(when: 'CONFIG_LS7A_RTC', if_true: files('ls7a_rtc.c'))
 -softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-rtc.c'))
 -softmmu_ss.add(when: 'CONFIG_MC146818RTC', if_true: files('mc146818rtc.c'))
 +system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_rtc.c'))
 +system_ss.add(when: 'CONFIG_SUN4V_RTC', if_true: files('sun4v-rtc.c'))
 +system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_rtc.c'))
 +system_ss.add(when: 'CONFIG_GOLDFISH_RTC', if_true: files('goldfish_rtc.c'))
 +system_ss.add(when: 'CONFIG_LS7A_RTC', if_true: files('ls7a_rtc.c'))
 +system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-rtc.c'))
 +system_ss.add(when: 'CONFIG_MC146818RTC', if_true: files('mc146818rtc.c'))
 diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/scsi/meson.build
 +++ b/hw/scsi/meson.build
@@ -XXX,XX +XXX,XX @@ scsi_ss.add(when: 'CONFIG_LSI_SCSI_PCI', if_true: files('lsi53c895a.c'))
  scsi_ss.add(when: 'CONFIG_MEGASAS_SCSI_PCI', if_true: files('megasas.c'))
  scsi_ss.add(when: 'CONFIG_MPTSAS_SCSI_PCI', if_true: files('mptsas.c', 'mptconfig.c', 'mptendian.c'))
  scsi_ss.add(when: 'CONFIG_VMW_PVSCSI_SCSI_PCI', if_true: files('vmw_pvscsi.c'))
 -softmmu_ss.add_all(when: 'CONFIG_SCSI', if_true: scsi_ss)
 +system_ss.add_all(when: 'CONFIG_SCSI', if_true: scsi_ss)
  specific_scsi_ss = ss.source_set()
 diff --git a/hw/sd/meson.build b/hw/sd/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/sd/meson.build
 +++ b/hw/sd/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_PL181', if_true: files('pl181.c'))
 -softmmu_ss.add(when: 'CONFIG_SD', if_true: files('sd.c', 'core.c', 'sdmmc-internal.c'))
 -softmmu_ss.add(when: 'CONFIG_SDHCI', if_true: files('sdhci.c'))
 -softmmu_ss.add(when: 'CONFIG_SDHCI_PCI', if_true: files('sdhci-pci.c'))
 -softmmu_ss.add(when: 'CONFIG_SSI_SD', if_true: files('ssi-sd.c'))
 +system_ss.add(when: 'CONFIG_PL181', if_true: files('pl181.c'))
 +system_ss.add(when: 'CONFIG_SD', if_true: files('sd.c', 'core.c', 'sdmmc-internal.c'))
 +system_ss.add(when: 'CONFIG_SDHCI', if_true: files('sdhci.c'))
 +system_ss.add(when: 'CONFIG_SDHCI_PCI', if_true: files('sdhci-pci.c'))
 +system_ss.add(when: 'CONFIG_SSI_SD', if_true: files('ssi-sd.c'))
 -softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_mmc.c'))
 -softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_mmci.c'))
 -softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_sdhost.c'))
 -softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_sdhci.c'))
 -softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sdhost.c'))
 -softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_sdhci.c'))
 -softmmu_ss.add(when: 'CONFIG_CADENCE_SDHCI', if_true: files('cadence_sdhci.c'))
 +system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_mmc.c'))
 +system_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_mmci.c'))
 +system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_sdhost.c'))
 +system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_sdhci.c'))
 +system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sdhost.c'))
 +system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_sdhci.c'))
 +system_ss.add(when: 'CONFIG_CADENCE_SDHCI', if_true: files('cadence_sdhci.c'))
 diff --git a/hw/sensor/meson.build b/hw/sensor/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/sensor/meson.build
 +++ b/hw/sensor/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_TMP105', if_true: files('tmp105.c'))
 -softmmu_ss.add(when: 'CONFIG_TMP421', if_true: files('tmp421.c'))
 -softmmu_ss.add(when: 'CONFIG_DPS310', if_true: files('dps310.c'))
 -softmmu_ss.add(when: 'CONFIG_EMC141X', if_true: files('emc141x.c'))
 -softmmu_ss.add(when: 'CONFIG_ADM1272', if_true: files('adm1272.c'))
 -softmmu_ss.add(when: 'CONFIG_MAX34451', if_true: files('max34451.c'))
 -softmmu_ss.add(when: 'CONFIG_LSM303DLHC_MAG', if_true: files('lsm303dlhc_mag.c'))
 -softmmu_ss.add(when: 'CONFIG_ISL_PMBUS_VR', if_true: files('isl_pmbus_vr.c'))
 -softmmu_ss.add(when: 'CONFIG_MAX31785', if_true: files('max31785.c'))
 +system_ss.add(when: 'CONFIG_TMP105', if_true: files('tmp105.c'))
 +system_ss.add(when: 'CONFIG_TMP421', if_true: files('tmp421.c'))
 +system_ss.add(when: 'CONFIG_DPS310', if_true: files('dps310.c'))
 +system_ss.add(when: 'CONFIG_EMC141X', if_true: files('emc141x.c'))
 +system_ss.add(when: 'CONFIG_ADM1272', if_true: files('adm1272.c'))
 +system_ss.add(when: 'CONFIG_MAX34451', if_true: files('max34451.c'))
 +system_ss.add(when: 'CONFIG_LSM303DLHC_MAG', if_true: files('lsm303dlhc_mag.c'))
 +system_ss.add(when: 'CONFIG_ISL_PMBUS_VR', if_true: files('isl_pmbus_vr.c'))
 +system_ss.add(when: 'CONFIG_MAX31785', if_true: files('max31785.c'))
 diff --git a/hw/smbios/meson.build b/hw/smbios/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/smbios/meson.build
 +++ b/hw/smbios/meson.build
@@ -XXX,XX +XXX,XX @@ smbios_ss.add(when: 'CONFIG_IPMI',
                if_true: files('smbios_type_38.c'),
                if_false: files('smbios_type_38-stub.c'))
 -softmmu_ss.add_all(when: 'CONFIG_SMBIOS', if_true: smbios_ss)
 -softmmu_ss.add(when: 'CONFIG_SMBIOS', if_false: files('smbios-stub.c'))
 +system_ss.add_all(when: 'CONFIG_SMBIOS', if_true: smbios_ss)
 +system_ss.add(when: 'CONFIG_SMBIOS', if_false: files('smbios-stub.c'))
 -softmmu_ss.add(when: 'CONFIG_ALL', if_true: files(
 +system_ss.add(when: 'CONFIG_ALL', if_true: files(
    'smbios-stub.c',
    'smbios_type_38-stub.c',
  ))
 diff --git a/hw/ssi/meson.build b/hw/ssi/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/ssi/meson.build
 +++ b/hw/ssi/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_smc.c'))
 -softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-spi.c'))
 -softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_fiu.c', 'npcm_pspi.c'))
 -softmmu_ss.add(when: 'CONFIG_PL022', if_true: files('pl022.c'))
 -softmmu_ss.add(when: 'CONFIG_SIFIVE_SPI', if_true: files('sifive_spi.c'))
 -softmmu_ss.add(when: 'CONFIG_SSI', if_true: files('ssi.c'))
 -softmmu_ss.add(when: 'CONFIG_STM32F2XX_SPI', if_true: files('stm32f2xx_spi.c'))
 -softmmu_ss.add(when: 'CONFIG_XILINX_SPI', if_true: files('xilinx_spi.c'))
 -softmmu_ss.add(when: 'CONFIG_XILINX_SPIPS', if_true: files('xilinx_spips.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-ospi.c'))
 -softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_spi.c'))
 -softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_spi.c'))
 -softmmu_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_spi_host.c'))
 +system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_smc.c'))
 +system_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-spi.c'))
 +system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_fiu.c', 'npcm_pspi.c'))
 +system_ss.add(when: 'CONFIG_PL022', if_true: files('pl022.c'))
 +system_ss.add(when: 'CONFIG_SIFIVE_SPI', if_true: files('sifive_spi.c'))
 +system_ss.add(when: 'CONFIG_SSI', if_true: files('ssi.c'))
 +system_ss.add(when: 'CONFIG_STM32F2XX_SPI', if_true: files('stm32f2xx_spi.c'))
 +system_ss.add(when: 'CONFIG_XILINX_SPI', if_true: files('xilinx_spi.c'))
 +system_ss.add(when: 'CONFIG_XILINX_SPIPS', if_true: files('xilinx_spips.c'))
 +system_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-ospi.c'))
 +system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_spi.c'))
 +system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_spi.c'))
 +system_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_spi_host.c'))
 diff --git a/hw/timer/meson.build b/hw/timer/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/timer/meson.build
 +++ b/hw/timer/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_A9_GTIMER', if_true: files('a9gtimer.c'))
 -softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10_PIT', if_true: files('allwinner-a10-pit.c'))
 -softmmu_ss.add(when: 'CONFIG_ALTERA_TIMER', if_true: files('altera_timer.c'))
 -softmmu_ss.add(when: 'CONFIG_ARM_MPTIMER', if_true: files('arm_mptimer.c'))
 -softmmu_ss.add(when: 'CONFIG_ARM_TIMER', if_true: files('arm_timer.c'))
 -softmmu_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_systick.c'))
 -softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_timer.c'))
 -softmmu_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_ttc.c'))
 -softmmu_ss.add(when: 'CONFIG_CMSDK_APB_DUALTIMER', if_true: files('cmsdk-apb-dualtimer.c'))
 -softmmu_ss.add(when: 'CONFIG_CMSDK_APB_TIMER', if_true: files('cmsdk-apb-timer.c'))
 -softmmu_ss.add(when: 'CONFIG_RENESAS_TMR', if_true: files('renesas_tmr.c'))
 -softmmu_ss.add(when: 'CONFIG_RENESAS_CMT', if_true: files('renesas_cmt.c'))
 -softmmu_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic-timer.c'))
 -softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_timer.c'))
 -softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_mct.c'))
 -softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pwm.c'))
 -softmmu_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_gptimer.c'))
 -softmmu_ss.add(when: 'CONFIG_HPET', if_true: files('hpet.c'))
 -softmmu_ss.add(when: 'CONFIG_I8254', if_true: files('i8254_common.c', 'i8254.c'))
 -softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_epit.c'))
 -softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpt.c'))
 -softmmu_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gictimer.c'))
 -softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-timer.c'))
 -softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_timer.c'))
 -softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_timer.c'))
 -softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gptimer.c'))
 -softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_synctimer.c'))
 -softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_timer.c'))
 -softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_systmr.c'))
 -softmmu_ss.add(when: 'CONFIG_SH_TIMER', if_true: files('sh_timer.c'))
 -softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_timer.c'))
 -softmmu_ss.add(when: 'CONFIG_SSE_COUNTER', if_true: files('sse-counter.c'))
 -softmmu_ss.add(when: 'CONFIG_SSE_TIMER', if_true: files('sse-timer.c'))
 -softmmu_ss.add(when: 'CONFIG_STELLARIS_GPTM', if_true: files('stellaris-gptm.c'))
 -softmmu_ss.add(when: 'CONFIG_STM32F2XX_TIMER', if_true: files('stm32f2xx_timer.c'))
 -softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_timer.c'))
 +system_ss.add(when: 'CONFIG_A9_GTIMER', if_true: files('a9gtimer.c'))
 +system_ss.add(when: 'CONFIG_ALLWINNER_A10_PIT', if_true: files('allwinner-a10-pit.c'))
 +system_ss.add(when: 'CONFIG_ALTERA_TIMER', if_true: files('altera_timer.c'))
 +system_ss.add(when: 'CONFIG_ARM_MPTIMER', if_true: files('arm_mptimer.c'))
 +system_ss.add(when: 'CONFIG_ARM_TIMER', if_true: files('arm_timer.c'))
 +system_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_systick.c'))
 +system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_timer.c'))
 +system_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_ttc.c'))
 +system_ss.add(when: 'CONFIG_CMSDK_APB_DUALTIMER', if_true: files('cmsdk-apb-dualtimer.c'))
 +system_ss.add(when: 'CONFIG_CMSDK_APB_TIMER', if_true: files('cmsdk-apb-timer.c'))
 +system_ss.add(when: 'CONFIG_RENESAS_TMR', if_true: files('renesas_tmr.c'))
 +system_ss.add(when: 'CONFIG_RENESAS_CMT', if_true: files('renesas_cmt.c'))
 +system_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic-timer.c'))
 +system_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_timer.c'))
 +system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_mct.c'))
 +system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pwm.c'))
 +system_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_gptimer.c'))
 +system_ss.add(when: 'CONFIG_HPET', if_true: files('hpet.c'))
 +system_ss.add(when: 'CONFIG_I8254', if_true: files('i8254_common.c', 'i8254.c'))
 +system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_epit.c'))
 +system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpt.c'))
 +system_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gictimer.c'))
 +system_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-timer.c'))
 +system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_timer.c'))
 +system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_timer.c'))
 +system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gptimer.c'))
 +system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_synctimer.c'))
 +system_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_timer.c'))
 +system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_systmr.c'))
 +system_ss.add(when: 'CONFIG_SH_TIMER', if_true: files('sh_timer.c'))
 +system_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_timer.c'))
 +system_ss.add(when: 'CONFIG_SSE_COUNTER', if_true: files('sse-counter.c'))
 +system_ss.add(when: 'CONFIG_SSE_TIMER', if_true: files('sse-timer.c'))
 +system_ss.add(when: 'CONFIG_STELLARIS_GPTM', if_true: files('stellaris-gptm.c'))
 +system_ss.add(when: 'CONFIG_STM32F2XX_TIMER', if_true: files('stm32f2xx_timer.c'))
 +system_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_timer.c'))
  specific_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_timer.c'))
 -softmmu_ss.add(when: 'CONFIG_SIFIVE_PWM', if_true: files('sifive_pwm.c'))
 +system_ss.add(when: 'CONFIG_SIFIVE_PWM', if_true: files('sifive_pwm.c'))
  specific_ss.add(when: 'CONFIG_AVR_TIMER16', if_true: files('avr_timer16.c'))
 diff --git a/hw/tpm/meson.build b/hw/tpm/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/tpm/meson.build
 +++ b/hw/tpm/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_tis_common.c'))
 -softmmu_ss.add(when: 'CONFIG_TPM_TIS_ISA', if_true: files('tpm_tis_isa.c'))
 -softmmu_ss.add(when: 'CONFIG_TPM_TIS_SYSBUS', if_true: files('tpm_tis_sysbus.c'))
 -softmmu_ss.add(when: 'CONFIG_TPM_TIS_I2C', if_true: files('tpm_tis_i2c.c'))
 -softmmu_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_crb.c'))
 -softmmu_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_ppi.c'))
 -softmmu_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_ppi.c'))
 +system_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_tis_common.c'))
 +system_ss.add(when: 'CONFIG_TPM_TIS_ISA', if_true: files('tpm_tis_isa.c'))
 +system_ss.add(when: 'CONFIG_TPM_TIS_SYSBUS', if_true: files('tpm_tis_sysbus.c'))
 +system_ss.add(when: 'CONFIG_TPM_TIS_I2C', if_true: files('tpm_tis_i2c.c'))
 +system_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_crb.c'))
 +system_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_ppi.c'))
 +system_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_ppi.c'))
  specific_ss.add(when: 'CONFIG_TPM_SPAPR', if_true: files('tpm_spapr.c'))
 diff --git a/hw/usb/meson.build b/hw/usb/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/usb/meson.build
 +++ b/hw/usb/meson.build
@@ -XXX,XX +XXX,XX @@
  hw_usb_modules = {}
  # usb subsystem core
 -softmmu_ss.add(when: 'CONFIG_USB', if_true: files(
 +system_ss.add(when: 'CONFIG_USB', if_true: files(
    'bus.c',
    'combined-packet.c',
    'core.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(when: 'CONFIG_USB', if_true: files(
  ))
  # usb host adapters
 -softmmu_ss.add(when: 'CONFIG_USB_UHCI', if_true: files('hcd-uhci.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_OHCI', if_true: files('hcd-ohci.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_OHCI_PCI', if_true: files('hcd-ohci-pci.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_EHCI', if_true: files('hcd-ehci.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_EHCI_PCI', if_true: files('hcd-ehci-pci.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_EHCI_SYSBUS', if_true: files('hcd-ehci.c', 'hcd-ehci-sysbus.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_XHCI', if_true: files('hcd-xhci.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_XHCI_PCI', if_true: files('hcd-xhci-pci.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_XHCI_SYSBUS', if_true: files('hcd-xhci-sysbus.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_XHCI_NEC', if_true: files('hcd-xhci-nec.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_MUSB', if_true: files('hcd-musb.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_DWC2', if_true: files('hcd-dwc2.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_DWC3', if_true: files('hcd-dwc3.c'))
 +system_ss.add(when: 'CONFIG_USB_UHCI', if_true: files('hcd-uhci.c'))
 +system_ss.add(when: 'CONFIG_USB_OHCI', if_true: files('hcd-ohci.c'))
 +system_ss.add(when: 'CONFIG_USB_OHCI_PCI', if_true: files('hcd-ohci-pci.c'))
 +system_ss.add(when: 'CONFIG_USB_EHCI', if_true: files('hcd-ehci.c'))
 +system_ss.add(when: 'CONFIG_USB_EHCI_PCI', if_true: files('hcd-ehci-pci.c'))
 +system_ss.add(when: 'CONFIG_USB_EHCI_SYSBUS', if_true: files('hcd-ehci.c', 'hcd-ehci-sysbus.c'))
 +system_ss.add(when: 'CONFIG_USB_XHCI', if_true: files('hcd-xhci.c'))
 +system_ss.add(when: 'CONFIG_USB_XHCI_PCI', if_true: files('hcd-xhci-pci.c'))
 +system_ss.add(when: 'CONFIG_USB_XHCI_SYSBUS', if_true: files('hcd-xhci-sysbus.c'))
 +system_ss.add(when: 'CONFIG_USB_XHCI_NEC', if_true: files('hcd-xhci-nec.c'))
 +system_ss.add(when: 'CONFIG_USB_MUSB', if_true: files('hcd-musb.c'))
 +system_ss.add(when: 'CONFIG_USB_DWC2', if_true: files('hcd-dwc2.c'))
 +system_ss.add(when: 'CONFIG_USB_DWC3', if_true: files('hcd-dwc3.c'))
 -softmmu_ss.add(when: 'CONFIG_TUSB6010', if_true: files('tusb6010.c'))
 -softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('chipidea.c'))
 -softmmu_ss.add(when: 'CONFIG_IMX_USBPHY', if_true: files('imx-usb-phy.c'))
 -softmmu_ss.add(when: 'CONFIG_VT82C686', if_true: files('vt82c686-uhci-pci.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-usb2-ctrl-regs.c'))
 -softmmu_ss.add(when: 'CONFIG_XLNX_USB_SUBSYS', if_true: files('xlnx-usb-subsystem.c'))
 +system_ss.add(when: 'CONFIG_TUSB6010', if_true: files('tusb6010.c'))
 +system_ss.add(when: 'CONFIG_IMX', if_true: files('chipidea.c'))
 +system_ss.add(when: 'CONFIG_IMX_USBPHY', if_true: files('imx-usb-phy.c'))
 +system_ss.add(when: 'CONFIG_VT82C686', if_true: files('vt82c686-uhci-pci.c'))
 +system_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-usb2-ctrl-regs.c'))
 +system_ss.add(when: 'CONFIG_XLNX_USB_SUBSYS', if_true: files('xlnx-usb-subsystem.c'))
  # emulated usb devices
 -softmmu_ss.add(when: 'CONFIG_USB', if_true: files('dev-hub.c'))
 -softmmu_ss.add(when: 'CONFIG_USB', if_true: files('dev-hid.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_TABLET_WACOM', if_true: files('dev-wacom.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_STORAGE_CORE', if_true: files('dev-storage.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_STORAGE_BOT', if_true: files('dev-storage-bot.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_STORAGE_CLASSIC', if_true: files('dev-storage-classic.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_STORAGE_UAS', if_true: files('dev-uas.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_AUDIO', if_true: files('dev-audio.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_SERIAL', if_true: files('dev-serial.c'))
 -softmmu_ss.add(when: 'CONFIG_USB_NETWORK', if_true: files('dev-network.c'))
 -softmmu_ss.add(when: ['CONFIG_POSIX', 'CONFIG_USB_STORAGE_MTP'], if_true: files('dev-mtp.c'))
 +system_ss.add(when: 'CONFIG_USB', if_true: files('dev-hub.c'))
 +system_ss.add(when: 'CONFIG_USB', if_true: files('dev-hid.c'))
 +system_ss.add(when: 'CONFIG_USB_TABLET_WACOM', if_true: files('dev-wacom.c'))
 +system_ss.add(when: 'CONFIG_USB_STORAGE_CORE', if_true: files('dev-storage.c'))
 +system_ss.add(when: 'CONFIG_USB_STORAGE_BOT', if_true: files('dev-storage-bot.c'))
 +system_ss.add(when: 'CONFIG_USB_STORAGE_CLASSIC', if_true: files('dev-storage-classic.c'))
 +system_ss.add(when: 'CONFIG_USB_STORAGE_UAS', if_true: files('dev-uas.c'))
 +system_ss.add(when: 'CONFIG_USB_AUDIO', if_true: files('dev-audio.c'))
 +system_ss.add(when: 'CONFIG_USB_SERIAL', if_true: files('dev-serial.c'))
 +system_ss.add(when: 'CONFIG_USB_NETWORK', if_true: files('dev-network.c'))
 +system_ss.add(when: ['CONFIG_POSIX', 'CONFIG_USB_STORAGE_MTP'], if_true: files('dev-mtp.c'))
  # smartcard
 -softmmu_ss.add(when: 'CONFIG_USB_SMARTCARD', if_true: files('dev-smartcard-reader.c'))
 +system_ss.add(when: 'CONFIG_USB_SMARTCARD', if_true: files('dev-smartcard-reader.c'))
  if cacard.found()
    usbsmartcard_ss = ss.source_set()
@@ -XXX,XX +XXX,XX @@ if cacard.found()
  endif
  # U2F
 -softmmu_ss.add(when: 'CONFIG_USB_U2F', if_true: files('u2f.c'))
 -softmmu_ss.add(when: ['CONFIG_LINUX', 'CONFIG_USB_U2F'], if_true: [libudev, files('u2f-passthru.c')])
 +system_ss.add(when: 'CONFIG_USB_U2F', if_true: files('u2f.c'))
 +system_ss.add(when: ['CONFIG_LINUX', 'CONFIG_USB_U2F'], if_true: [libudev, files('u2f-passthru.c')])
  if u2f.found()
 -  softmmu_ss.add(when: 'CONFIG_USB_U2F', if_true: [u2f, files('u2f-emulated.c')])
 +  system_ss.add(when: 'CONFIG_USB_U2F', if_true: [u2f, files('u2f-emulated.c')])
  endif
  # CanoKey
  if canokey.found()
 -  softmmu_ss.add(when: 'CONFIG_USB_CANOKEY', if_true: [canokey, files('canokey.c')])
 +  system_ss.add(when: 'CONFIG_USB_CANOKEY', if_true: [canokey, files('canokey.c')])
  endif
  # usb redirect
@@ -XXX,XX +XXX,XX @@ if libusb.found()
    hw_usb_modules += {'host': usbhost_ss}
  endif
 -softmmu_ss.add(when: ['CONFIG_USB', 'CONFIG_XEN_BUS', libusb], if_true: files('xen-usb.c'))
 +system_ss.add(when: ['CONFIG_USB', 'CONFIG_XEN_BUS', libusb], if_true: files('xen-usb.c'))
  modules += { 'hw-usb': hw_usb_modules }
 diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/virtio/meson.build
 +++ b/hw/virtio/meson.build
@@ -XXX,XX +XXX,XX @@ virtio_pci_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa-dev-pci.c'
  specific_virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss)
 -softmmu_ss.add_all(when: 'CONFIG_VIRTIO', if_true: softmmu_virtio_ss)
 -softmmu_ss.add(when: 'CONFIG_VIRTIO', if_false: files('vhost-stub.c'))
 -softmmu_ss.add(when: 'CONFIG_VIRTIO', if_false: files('virtio-stub.c'))
 -softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c'))
 -softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('virtio-stub.c'))
 -softmmu_ss.add(files('virtio-hmp-cmds.c'))
 +system_ss.add_all(when: 'CONFIG_VIRTIO', if_true: softmmu_virtio_ss)
 +system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('vhost-stub.c'))
 +system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('virtio-stub.c'))
 +system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c'))
 +system_ss.add(when: 'CONFIG_ALL', if_true: files('virtio-stub.c'))
 +system_ss.add(files('virtio-hmp-cmds.c'))
  specific_ss.add_all(when: 'CONFIG_VIRTIO', if_true: specific_virtio_ss)
 diff --git a/hw/watchdog/meson.build b/hw/watchdog/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/watchdog/meson.build
 +++ b/hw/watchdog/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(files('watchdog.c'))
 -softmmu_ss.add(when: 'CONFIG_ALLWINNER_WDT', if_true: files('allwinner-wdt.c'))
 -softmmu_ss.add(when: 'CONFIG_CMSDK_APB_WATCHDOG', if_true: files('cmsdk-apb-watchdog.c'))
 -softmmu_ss.add(when: 'CONFIG_WDT_IB6300ESB', if_true: files('wdt_i6300esb.c'))
 -softmmu_ss.add(when: 'CONFIG_WDT_IB700', if_true: files('wdt_ib700.c'))
 -softmmu_ss.add(when: 'CONFIG_WDT_DIAG288', if_true: files('wdt_diag288.c'))
 -softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('wdt_aspeed.c'))
 -softmmu_ss.add(when: 'CONFIG_WDT_IMX2', if_true: files('wdt_imx2.c'))
 -softmmu_ss.add(when: 'CONFIG_WDT_SBSA', if_true: files('sbsa_gwdt.c'))
 +system_ss.add(files('watchdog.c'))
 +system_ss.add(when: 'CONFIG_ALLWINNER_WDT', if_true: files('allwinner-wdt.c'))
 +system_ss.add(when: 'CONFIG_CMSDK_APB_WATCHDOG', if_true: files('cmsdk-apb-watchdog.c'))
 +system_ss.add(when: 'CONFIG_WDT_IB6300ESB', if_true: files('wdt_i6300esb.c'))
 +system_ss.add(when: 'CONFIG_WDT_IB700', if_true: files('wdt_ib700.c'))
 +system_ss.add(when: 'CONFIG_WDT_DIAG288', if_true: files('wdt_diag288.c'))
 +system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('wdt_aspeed.c'))
 +system_ss.add(when: 'CONFIG_WDT_IMX2', if_true: files('wdt_imx2.c'))
 +system_ss.add(when: 'CONFIG_WDT_SBSA', if_true: files('sbsa_gwdt.c'))
  specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_watchdog.c'))
 diff --git a/hw/xen/meson.build b/hw/xen/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/xen/meson.build
 +++ b/hw/xen/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: ['CONFIG_XEN_BUS'], if_true: files(
 +system_ss.add(when: ['CONFIG_XEN_BUS'], if_true: files(
    'xen-backend.c',
    'xen-bus-helper.c',
    'xen-bus.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(when: ['CONFIG_XEN_BUS'], if_true: files(
    'xen_pvdev.c',
  ))
 -softmmu_ss.add(when: ['CONFIG_XEN', xen], if_true: files(
 +system_ss.add(when: ['CONFIG_XEN', xen], if_true: files(
    'xen-operations.c',
  ))
 diff --git a/migration/meson.build b/migration/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/migration/meson.build
 +++ b/migration/meson.build
@@ -XXX,XX +XXX,XX @@ migration_files = files(
    'yank_functions.c',
  )
 -softmmu_ss.add(files(
 +system_ss.add(files(
    'block-dirty-bitmap.c',
    'channel.c',
    'channel-block.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(files(
  ), gnutls)
  if get_option('replication').allowed()
 -  softmmu_ss.add(files('colo-failover.c', 'colo.c'))
 +  system_ss.add(files('colo-failover.c', 'colo.c'))
  endif
 -softmmu_ss.add(when: rdma, if_true: files('rdma.c'))
 +system_ss.add(when: rdma, if_true: files('rdma.c'))
  if get_option('live_block_migration').allowed()
 -  softmmu_ss.add(files('block.c'))
 +  system_ss.add(files('block.c'))
  endif
 -softmmu_ss.add(when: zstd, if_true: files('multifd-zstd.c'))
 +system_ss.add(when: zstd, if_true: files('multifd-zstd.c'))
  specific_ss.add(when: 'CONFIG_SYSTEM_ONLY',
                  if_true: files('ram.c',
 diff --git a/monitor/meson.build b/monitor/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/monitor/meson.build
 +++ b/monitor/meson.build
@@ -XXX,XX +XXX,XX @@
  qmp_ss.add(files('monitor.c', 'qmp.c', 'qmp-cmds-control.c'))
 -softmmu_ss.add(files(
 +system_ss.add(files(
    'fds.c',
    'hmp-cmds.c',
    'hmp.c',
  ))
 -softmmu_ss.add([spice_headers, files('qmp-cmds.c')])
 +system_ss.add([spice_headers, files('qmp-cmds.c')])
  specific_ss.add(when: 'CONFIG_SYSTEM_ONLY',
          if_true: [files( 'hmp-cmds-target.c', 'hmp-target.c'), spice])
 diff --git a/net/can/meson.build b/net/can/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/net/can/meson.build
 +++ b/net/can/meson.build
@@ -XXX,XX +XXX,XX @@ can_ss = ss.source_set()
  can_ss.add(files('can_core.c', 'can_host.c'))
  can_ss.add(when: 'CONFIG_LINUX', if_true: files('can_socketcan.c'))
 -softmmu_ss.add_all(when: 'CONFIG_CAN_BUS', if_true: can_ss)
 +system_ss.add_all(when: 'CONFIG_CAN_BUS', if_true: can_ss)
 diff --git a/net/meson.build b/net/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/net/meson.build
 +++ b/net/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(files(
 +system_ss.add(files(
    'announce.c',
    'checksum.c',
    'dump.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(files(
  if get_option('replication').allowed() or \
      get_option('colo_proxy').allowed()
 -  softmmu_ss.add(files('colo-compare.c'))
 -  softmmu_ss.add(files('colo.c'))
 +  system_ss.add(files('colo-compare.c'))
 +  system_ss.add(files('colo.c'))
  endif
  if get_option('colo_proxy').allowed()
 -  softmmu_ss.add(files('filter-rewriter.c'))
 +  system_ss.add(files('filter-rewriter.c'))
  endif
 -softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('filter-replay.c'))
 +system_ss.add(when: 'CONFIG_TCG', if_true: files('filter-replay.c'))
  if have_l2tpv3
 -  softmmu_ss.add(files('l2tpv3.c'))
 +  system_ss.add(files('l2tpv3.c'))
  endif
 -softmmu_ss.add(when: slirp, if_true: files('slirp.c'))
 -softmmu_ss.add(when: vde, if_true: files('vde.c'))
 +system_ss.add(when: slirp, if_true: files('slirp.c'))
 +system_ss.add(when: vde, if_true: files('vde.c'))
  if have_netmap
 -  softmmu_ss.add(files('netmap.c'))
 +  system_ss.add(files('netmap.c'))
  endif
  if have_vhost_net_user
 -  softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-user.c'), if_false: files('vhost-user-stub.c'))
 -  softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-user-stub.c'))
 +  system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-user.c'), if_false: files('vhost-user-stub.c'))
 +  system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-user-stub.c'))
  endif
 -softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('tap-linux.c'))
 -softmmu_ss.add(when: 'CONFIG_BSD', if_true: files('tap-bsd.c'))
 -softmmu_ss.add(when: 'CONFIG_SOLARIS', if_true: files('tap-solaris.c'))
 +system_ss.add(when: 'CONFIG_LINUX', if_true: files('tap-linux.c'))
 +system_ss.add(when: 'CONFIG_BSD', if_true: files('tap-bsd.c'))
 +system_ss.add(when: 'CONFIG_SOLARIS', if_true: files('tap-solaris.c'))
  tap_posix = ['tap.c']
  if not config_host.has_key('CONFIG_LINUX') and not config_host.has_key('CONFIG_BSD') and not config_host.has_key('CONFIG_SOLARIS')
    tap_posix += 'tap-stub.c'
  endif
 -softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files(tap_posix))
 -softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('tap-win32.c'))
 +system_ss.add(when: 'CONFIG_POSIX', if_true: files(tap_posix))
 +system_ss.add(when: 'CONFIG_WIN32', if_true: files('tap-win32.c'))
  if have_vhost_net_vdpa
 -  softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-vdpa.c'), if_false: files('vhost-vdpa-stub.c'))
 -  softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-vdpa-stub.c'))
 +  system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-vdpa.c'), if_false: files('vhost-vdpa-stub.c'))
 +  system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-vdpa-stub.c'))
  endif
  vmnet_files = files(
@@ -XXX,XX +XXX,XX @@ vmnet_files = files(
    'vmnet-host.c',
    'vmnet-shared.c'
  )
 -softmmu_ss.add(when: vmnet, if_true: vmnet_files)
 +system_ss.add(when: vmnet, if_true: vmnet_files)
  subdir('can')
 diff --git a/qom/meson.build b/qom/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/qom/meson.build
 +++ b/qom/meson.build
@@ -XXX,XX +XXX,XX @@ qom_ss.add(files(
  ))
  qmp_ss.add(files('qom-qmp-cmds.c'))
 -softmmu_ss.add(files('qom-hmp-cmds.c'))
 +system_ss.add(files('qom-hmp-cmds.c'))
 diff --git a/replay/meson.build b/replay/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/replay/meson.build
 +++ b/replay/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(when: 'CONFIG_TCG', if_true: files(
 +system_ss.add(when: 'CONFIG_TCG', if_true: files(
    'replay.c',
    'replay-internal.c',
    'replay-events.c',
 diff --git a/softmmu/meson.build b/softmmu/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/softmmu/meson.build
 +++ b/softmmu/meson.build
@@ -XXX,XX +XXX,XX @@ specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: [files(
    'icount.c',
  )])
 -softmmu_ss.add(files(
 +system_ss.add(files(
    'balloon.c',
    'bootdevice.c',
    'cpus.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(files(
  ), sdl, libpmem, libdaxctl)
  if have_tpm
 -  softmmu_ss.add(files('tpm.c'))
 +  system_ss.add(files('tpm.c'))
  endif
 -softmmu_ss.add(when: seccomp, if_true: files('qemu-seccomp.c'))
 -softmmu_ss.add(when: fdt, if_true: files('device_tree.c'))
 +system_ss.add(when: seccomp, if_true: files('qemu-seccomp.c'))
 +system_ss.add(when: fdt, if_true: files('device_tree.c'))
 diff --git a/stats/meson.build b/stats/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/stats/meson.build
 +++ b/stats/meson.build
@@ -1 +1 @@
 -softmmu_ss.add(files('stats-hmp-cmds.c', 'stats-qmp-cmds.c'))
 +system_ss.add(files('stats-hmp-cmds.c', 'stats-qmp-cmds.c'))
 diff --git a/target/alpha/meson.build b/target/alpha/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/alpha/meson.build
 +++ b/target/alpha/meson.build
@@ -XXX,XX +XXX,XX @@ alpha_ss.add(files(
    'vax_helper.c',
  ))
 -alpha_softmmu_ss = ss.source_set()
 -alpha_softmmu_ss.add(files('machine.c'))
 +alpha_system_ss = ss.source_set()
 +alpha_system_ss.add(files('machine.c'))
  target_arch += {'alpha': alpha_ss}
 -target_softmmu_arch += {'alpha': alpha_softmmu_ss}
 +target_softmmu_arch += {'alpha': alpha_system_ss}
 diff --git a/target/arm/hvf/meson.build b/target/arm/hvf/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/arm/hvf/meson.build
 +++ b/target/arm/hvf/meson.build
@@ -XXX,XX +XXX,XX @@
 -arm_softmmu_ss.add(when: [hvf, 'CONFIG_HVF'], if_true: files(
 +arm_system_ss.add(when: [hvf, 'CONFIG_HVF'], if_true: files(
    'hvf.c',
  ))
 diff --git a/target/arm/meson.build b/target/arm/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/arm/meson.build
 +++ b/target/arm/meson.build
@@ -XXX,XX +XXX,XX @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
    'gdbstub64.c',
  ))
 -arm_softmmu_ss = ss.source_set()
 -arm_softmmu_ss.add(files(
 +arm_system_ss = ss.source_set()
 +arm_system_ss.add(files(
    'arch_dump.c',
    'arm-powerctl.c',
    'arm-qmp-cmds.c',
@@ -XXX,XX +XXX,XX @@ else
  endif
  target_arch += {'arm': arm_ss}
 -target_softmmu_arch += {'arm': arm_softmmu_ss}
 +target_softmmu_arch += {'arm': arm_system_ss}
 diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/arm/tcg/meson.build
 +++ b/target/arm/tcg/meson.build
@@ -XXX,XX +XXX,XX @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
    'sve_helper.c',
  ))
 -arm_softmmu_ss.add(files(
 +arm_system_ss.add(files(
    'psci.c',
  ))
 diff --git a/target/avr/meson.build b/target/avr/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/avr/meson.build
 +++ b/target/avr/meson.build
@@ -XXX,XX +XXX,XX @@ gen = [
  ]
  avr_ss = ss.source_set()
 -avr_softmmu_ss = ss.source_set()
 +avr_system_ss = ss.source_set()
  avr_ss.add(gen)
  avr_ss.add(files(
@@ -XXX,XX +XXX,XX @@ avr_ss.add(files(
    'gdbstub.c',
    'disas.c'))
 -avr_softmmu_ss.add(files('machine.c'))
 +avr_system_ss.add(files('machine.c'))
  target_arch += {'avr': avr_ss}
 -target_softmmu_arch += {'avr': avr_softmmu_ss}
 +target_softmmu_arch += {'avr': avr_system_ss}
 diff --git a/target/cris/meson.build b/target/cris/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/cris/meson.build
 +++ b/target/cris/meson.build
@@ -XXX,XX +XXX,XX @@ cris_ss.add(files(
    'translate.c',
  ))
 -cris_softmmu_ss = ss.source_set()
 -cris_softmmu_ss.add(files(
 +cris_system_ss = ss.source_set()
 +cris_system_ss.add(files(
    'helper.c',
    'machine.c',
    'mmu.c',
  ))
  target_arch += {'cris': cris_ss}
 -target_softmmu_arch += {'cris': cris_softmmu_ss}
 +target_softmmu_arch += {'cris': cris_system_ss}
 diff --git a/target/hppa/meson.build b/target/hppa/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/hppa/meson.build
 +++ b/target/hppa/meson.build
@@ -XXX,XX +XXX,XX @@ hppa_ss.add(files(
    'translate.c',
  ))
 -hppa_softmmu_ss = ss.source_set()
 -hppa_softmmu_ss.add(files(
 +hppa_system_ss = ss.source_set()
 +hppa_system_ss.add(files(
    'int_helper.c',
    'machine.c',
    'mem_helper.c',
@@ -XXX,XX +XXX,XX @@ hppa_softmmu_ss.add(files(
  ))
  target_arch += {'hppa': hppa_ss}
 -target_softmmu_arch += {'hppa': hppa_softmmu_ss}
 +target_softmmu_arch += {'hppa': hppa_system_ss}
 diff --git a/target/i386/hax/meson.build b/target/i386/hax/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/i386/hax/meson.build
 +++ b/target/i386/hax/meson.build
@@ -XXX,XX +XXX,XX @@
 -i386_softmmu_ss.add(when: 'CONFIG_HAX', if_true: files(
 +i386_system_ss.add(when: 'CONFIG_HAX', if_true: files(
    'hax-all.c',
    'hax-mem.c',
    'hax-accel-ops.c',
  ))
 -i386_softmmu_ss.add(when: ['CONFIG_HAX', 'CONFIG_POSIX'], if_true: files('hax-posix.c'))
 -i386_softmmu_ss.add(when: ['CONFIG_HAX', 'CONFIG_WIN32'], if_true: files('hax-windows.c'))
 +i386_system_ss.add(when: ['CONFIG_HAX', 'CONFIG_POSIX'], if_true: files('hax-posix.c'))
 +i386_system_ss.add(when: ['CONFIG_HAX', 'CONFIG_WIN32'], if_true: files('hax-windows.c'))
 diff --git a/target/i386/hvf/meson.build b/target/i386/hvf/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/i386/hvf/meson.build
 +++ b/target/i386/hvf/meson.build
@@ -XXX,XX +XXX,XX @@
 -i386_softmmu_ss.add(when: [hvf, 'CONFIG_HVF'], if_true: files(
 +i386_system_ss.add(when: [hvf, 'CONFIG_HVF'], if_true: files(
    'hvf.c',
    'x86.c',
    'x86_cpuid.c',
 diff --git a/target/i386/kvm/meson.build b/target/i386/kvm/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/i386/kvm/meson.build
 +++ b/target/i386/kvm/meson.build
@@ -XXX,XX +XXX,XX @@ i386_softmmu_kvm_ss.add(when: 'CONFIG_XEN_EMU', if_true: files('xen-emu.c'))
  i386_softmmu_kvm_ss.add(when: 'CONFIG_SEV', if_false: files('sev-stub.c'))
 -i386_softmmu_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c'), if_false: files('hyperv-stub.c'))
 +i386_system_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c'), if_false: files('hyperv-stub.c'))
 -i386_softmmu_ss.add_all(when: 'CONFIG_KVM', if_true: i386_softmmu_kvm_ss)
 +i386_system_ss.add_all(when: 'CONFIG_KVM', if_true: i386_softmmu_kvm_ss)
 diff --git a/target/i386/meson.build b/target/i386/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/i386/meson.build
 +++ b/target/i386/meson.build
@@ -XXX,XX +XXX,XX @@ i386_ss.add(when: 'CONFIG_SEV', if_true: files('host-cpu.c'))
  i386_ss.add(when: 'CONFIG_KVM', if_true: files('host-cpu.c'))
  i386_ss.add(when: 'CONFIG_HVF', if_true: files('host-cpu.c'))
 -i386_softmmu_ss = ss.source_set()
 -i386_softmmu_ss.add(files(
 +i386_system_ss = ss.source_set()
 +i386_system_ss.add(files(
    'arch_dump.c',
    'arch_memory_mapping.c',
    'machine.c',
    'monitor.c',
    'cpu-sysemu.c',
  ))
 -i386_softmmu_ss.add(when: 'CONFIG_SEV', if_true: files('sev.c'), if_false: files('sev-sysemu-stub.c'))
 +i386_system_ss.add(when: 'CONFIG_SEV', if_true: files('sev.c'), if_false: files('sev-sysemu-stub.c'))
  i386_user_ss = ss.source_set()
@@ -XXX,XX +XXX,XX @@ subdir('hvf')
  subdir('tcg')
  target_arch += {'i386': i386_ss}
 -target_softmmu_arch += {'i386': i386_softmmu_ss}
 +target_softmmu_arch += {'i386': i386_system_ss}
  target_user_arch += {'i386': i386_user_ss}
 diff --git a/target/i386/nvmm/meson.build b/target/i386/nvmm/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/i386/nvmm/meson.build
 +++ b/target/i386/nvmm/meson.build
@@ -XXX,XX +XXX,XX @@
 -i386_softmmu_ss.add(when: 'CONFIG_NVMM', if_true:
 +i386_system_ss.add(when: 'CONFIG_NVMM', if_true:
    files(
    'nvmm-all.c',
    'nvmm-accel-ops.c',
    )
  )
 -i386_softmmu_ss.add(when: 'CONFIG_NVMM', if_true: nvmm)
 +i386_system_ss.add(when: 'CONFIG_NVMM', if_true: nvmm)
 diff --git a/target/i386/tcg/sysemu/meson.build b/target/i386/tcg/sysemu/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/i386/tcg/sysemu/meson.build
 +++ b/target/i386/tcg/sysemu/meson.build
@@ -XXX,XX +XXX,XX @@
 -i386_softmmu_ss.add(when: ['CONFIG_TCG', 'CONFIG_SYSTEM_ONLY'], if_true: files(
 +i386_system_ss.add(when: ['CONFIG_TCG', 'CONFIG_SYSTEM_ONLY'], if_true: files(
    'tcg-cpu.c',
    'smm_helper.c',
    'excp_helper.c',
 diff --git a/target/i386/whpx/meson.build b/target/i386/whpx/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/i386/whpx/meson.build
 +++ b/target/i386/whpx/meson.build
@@ -XXX,XX +XXX,XX @@
 -i386_softmmu_ss.add(when: 'CONFIG_WHPX', if_true: files(
 +i386_system_ss.add(when: 'CONFIG_WHPX', if_true: files(
    'whpx-all.c',
    'whpx-apic.c',
    'whpx-accel-ops.c',
 diff --git a/target/loongarch/meson.build b/target/loongarch/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/loongarch/meson.build
 +++ b/target/loongarch/meson.build
@@ -XXX,XX +XXX,XX @@ loongarch_tcg_ss.add(files(
  ))
  loongarch_tcg_ss.add(zlib)
 -loongarch_softmmu_ss = ss.source_set()
 -loongarch_softmmu_ss.add(files(
 +loongarch_system_ss = ss.source_set()
 +loongarch_system_ss.add(files(
    'loongarch-qmp-cmds.c',
    'machine.c',
    'tlb_helper.c',
@@ -XXX,XX +XXX,XX @@ common_ss.add(when: 'CONFIG_LOONGARCH_DIS', if_true: [files('disas.c'), gen])
  loongarch_ss.add_all(when: 'CONFIG_TCG', if_true: [loongarch_tcg_ss])
  target_arch += {'loongarch': loongarch_ss}
 -target_softmmu_arch += {'loongarch': loongarch_softmmu_ss}
 +target_softmmu_arch += {'loongarch': loongarch_system_ss}
 diff --git a/target/m68k/meson.build b/target/m68k/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/m68k/meson.build
 +++ b/target/m68k/meson.build
@@ -XXX,XX +XXX,XX @@ m68k_ss.add(files(
    'translate.c',
  ))
 -m68k_softmmu_ss = ss.source_set()
 -m68k_softmmu_ss.add(files(
 +m68k_system_ss = ss.source_set()
 +m68k_system_ss.add(files(
    'm68k-semi.c',
    'monitor.c'
  ))
  target_arch += {'m68k': m68k_ss}
 -target_softmmu_arch += {'m68k': m68k_softmmu_ss}
 +target_softmmu_arch += {'m68k': m68k_system_ss}
 diff --git a/target/microblaze/meson.build b/target/microblaze/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/microblaze/meson.build
 +++ b/target/microblaze/meson.build
@@ -XXX,XX +XXX,XX @@ microblaze_ss.add(files(
    'translate.c',
  ))
 -microblaze_softmmu_ss = ss.source_set()
 -microblaze_softmmu_ss.add(files(
 +microblaze_system_ss = ss.source_set()
 +microblaze_system_ss.add(files(
    'mmu.c',
    'machine.c',
  ))
  target_arch += {'microblaze': microblaze_ss}
 -target_softmmu_arch += {'microblaze': microblaze_softmmu_ss}
 +target_softmmu_arch += {'microblaze': microblaze_system_ss}
 diff --git a/target/mips/meson.build b/target/mips/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/mips/meson.build
 +++ b/target/mips/meson.build
@@ -XXX,XX +XXX,XX @@
  mips_user_ss = ss.source_set()
 -mips_softmmu_ss = ss.source_set()
 +mips_system_ss = ss.source_set()
  mips_ss = ss.source_set()
  mips_ss.add(files(
    'cpu.c',
@@ -XXX,XX +XXX,XX @@ endif
  mips_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'))
  target_arch += {'mips': mips_ss}
 -target_softmmu_arch += {'mips': mips_softmmu_ss}
 +target_softmmu_arch += {'mips': mips_system_ss}
  target_user_arch += {'mips': mips_user_ss}
 diff --git a/target/mips/sysemu/meson.build b/target/mips/sysemu/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/mips/sysemu/meson.build
 +++ b/target/mips/sysemu/meson.build
@@ -XXX,XX +XXX,XX @@
 -mips_softmmu_ss.add(files(
 +mips_system_ss.add(files(
    'addr.c',
    'cp0.c',
    'cp0_timer.c',
 diff --git a/target/mips/tcg/sysemu/meson.build b/target/mips/tcg/sysemu/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/mips/tcg/sysemu/meson.build
 +++ b/target/mips/tcg/sysemu/meson.build
@@ -XXX,XX +XXX,XX @@
 -mips_softmmu_ss.add(files(
 +mips_system_ss.add(files(
    'cp0_helper.c',
    'mips-semi.c',
    'special_helper.c',
 diff --git a/target/nios2/meson.build b/target/nios2/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/nios2/meson.build
 +++ b/target/nios2/meson.build
@@ -XXX,XX +XXX,XX @@ nios2_ss.add(files(
    'translate.c',
  ))
 -nios2_softmmu_ss = ss.source_set()
 -nios2_softmmu_ss.add(files(
 +nios2_system_ss = ss.source_set()
 +nios2_system_ss.add(files(
    'helper.c',
    'monitor.c',
    'mmu.c',
@@ -XXX,XX +XXX,XX @@ nios2_softmmu_ss.add(files(
  ))
  target_arch += {'nios2': nios2_ss}
 -target_softmmu_arch += {'nios2': nios2_softmmu_ss}
 +target_softmmu_arch += {'nios2': nios2_system_ss}
 diff --git a/target/openrisc/meson.build b/target/openrisc/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/openrisc/meson.build
 +++ b/target/openrisc/meson.build
@@ -XXX,XX +XXX,XX @@ openrisc_ss.add(files(
    'translate.c',
  ))
 -openrisc_softmmu_ss = ss.source_set()
 -openrisc_softmmu_ss.add(files(
 +openrisc_system_ss = ss.source_set()
 +openrisc_system_ss.add(files(
    'interrupt.c',
    'machine.c',
    'mmu.c',
  ))
  target_arch += {'openrisc': openrisc_ss}
 -target_softmmu_arch += {'openrisc': openrisc_softmmu_ss}
 +target_softmmu_arch += {'openrisc': openrisc_system_ss}
 diff --git a/target/ppc/meson.build b/target/ppc/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/ppc/meson.build
 +++ b/target/ppc/meson.build
@@ -XXX,XX +XXX,XX @@ ppc_ss.add(gen)
  ppc_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('kvm-stub.c'))
  ppc_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user_only_helper.c'))
 -ppc_softmmu_ss = ss.source_set()
 -ppc_softmmu_ss.add(files(
 +ppc_system_ss = ss.source_set()
 +ppc_system_ss.add(files(
    'arch_dump.c',
    'machine.c',
    'mmu-hash32.c',
    'mmu_common.c',
    'ppc-qmp-cmds.c',
  ))
 -ppc_softmmu_ss.add(when: 'CONFIG_TCG', if_true: files(
 +ppc_system_ss.add(when: 'CONFIG_TCG', if_true: files(
    'mmu_helper.c',
  ), if_false: files(
    'tcg-stub.c',
  ))
 -ppc_softmmu_ss.add(when: 'TARGET_PPC64', if_true: files(
 +ppc_system_ss.add(when: 'TARGET_PPC64', if_true: files(
    'compat.c',
    'mmu-book3s-v3.c',
    'mmu-hash64.c',
@@ -XXX,XX +XXX,XX @@ ppc_softmmu_ss.add(when: 'TARGET_PPC64', if_true: files(
  ))
  target_arch += {'ppc': ppc_ss}
 -target_softmmu_arch += {'ppc': ppc_softmmu_ss}
 +target_softmmu_arch += {'ppc': ppc_system_ss}
 diff --git a/target/riscv/meson.build b/target/riscv/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/riscv/meson.build
 +++ b/target/riscv/meson.build
@@ -XXX,XX +XXX,XX @@ riscv_ss.add(files(
  ))
  riscv_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('kvm-stub.c'))
 -riscv_softmmu_ss = ss.source_set()
 -riscv_softmmu_ss.add(files(
 +riscv_system_ss = ss.source_set()
 +riscv_system_ss.add(files(
    'arch_dump.c',
    'pmp.c',
    'debug.c',
@@ -XXX,XX +XXX,XX @@ riscv_softmmu_ss.add(files(
  ))
  target_arch += {'riscv': riscv_ss}
 -target_softmmu_arch += {'riscv': riscv_softmmu_ss}
 +target_softmmu_arch += {'riscv': riscv_system_ss}
 diff --git a/target/s390x/kvm/meson.build b/target/s390x/kvm/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/s390x/kvm/meson.build
 +++ b/target/s390x/kvm/meson.build
@@ -XXX,XX +XXX,XX @@ s390x_ss.add(when: 'CONFIG_KVM', if_true: files(
  #  - KVM is enabled
  #  - the linker supports --s390-pgste
  if host_machine.cpu_family() == 's390x' and cc.has_link_argument('-Wl,--s390-pgste')
 -  s390x_softmmu_ss.add(when: 'CONFIG_KVM',
 +  s390x_system_ss.add(when: 'CONFIG_KVM',
                         if_true: declare_dependency(link_args: ['-Wl,--s390-pgste']))
  endif
 diff --git a/target/s390x/meson.build b/target/s390x/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/s390x/meson.build
 +++ b/target/s390x/meson.build
@@ -XXX,XX +XXX,XX @@ gen_features_h = custom_target('gen-features.h',
  s390x_ss.add(gen_features_h)
 -s390x_softmmu_ss = ss.source_set()
 -s390x_softmmu_ss.add(files(
 +s390x_system_ss = ss.source_set()
 +s390x_system_ss.add(files(
    'helper.c',
    'arch_dump.c',
    'diag.c',
@@ -XXX,XX +XXX,XX @@ subdir('tcg')
  subdir('kvm')
  target_arch += {'s390x': s390x_ss}
 -target_softmmu_arch += {'s390x': s390x_softmmu_ss}
 +target_softmmu_arch += {'s390x': s390x_system_ss}
  target_user_arch += {'s390x': s390x_user_ss}
 diff --git a/target/sh4/meson.build b/target/sh4/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/sh4/meson.build
 +++ b/target/sh4/meson.build
@@ -XXX,XX +XXX,XX @@ sh4_ss.add(files(
    'translate.c',
  ))
 -sh4_softmmu_ss = ss.source_set()
 -sh4_softmmu_ss.add(files('monitor.c'))
 +sh4_system_ss = ss.source_set()
 +sh4_system_ss.add(files('monitor.c'))
  target_arch += {'sh4': sh4_ss}
 -target_softmmu_arch += {'sh4': sh4_softmmu_ss}
 +target_softmmu_arch += {'sh4': sh4_system_ss}
 diff --git a/target/sparc/meson.build b/target/sparc/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/sparc/meson.build
 +++ b/target/sparc/meson.build
@@ -XXX,XX +XXX,XX @@ sparc_ss.add(files(
  sparc_ss.add(when: 'TARGET_SPARC', if_true: files('int32_helper.c'))
  sparc_ss.add(when: 'TARGET_SPARC64', if_true: files('int64_helper.c', 'vis_helper.c'))
 -sparc_softmmu_ss = ss.source_set()
 -sparc_softmmu_ss.add(files(
 +sparc_system_ss = ss.source_set()
 +sparc_system_ss.add(files(
    'machine.c',
    'mmu_helper.c',
    'monitor.c',
  ))
  target_arch += {'sparc': sparc_ss}
 -target_softmmu_arch += {'sparc': sparc_softmmu_ss}
 +target_softmmu_arch += {'sparc': sparc_system_ss}
 diff --git a/target/tricore/meson.build b/target/tricore/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/tricore/meson.build
 +++ b/target/tricore/meson.build
@@ -XXX,XX +XXX,XX @@ tricore_ss.add(files(
  ))
  tricore_ss.add(zlib)
 -tricore_softmmu_ss = ss.source_set()
 +tricore_system_ss = ss.source_set()
  target_arch += {'tricore': tricore_ss}
 -target_softmmu_arch += {'tricore': tricore_softmmu_ss}
 +target_softmmu_arch += {'tricore': tricore_system_ss}
 diff --git a/target/xtensa/meson.build b/target/xtensa/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/target/xtensa/meson.build
 +++ b/target/xtensa/meson.build
@@ -XXX,XX +XXX,XX @@ xtensa_ss.add(files(
    'xtensa-isa.c',
  ))
 -xtensa_softmmu_ss = ss.source_set()
 -xtensa_softmmu_ss.add(files(
 +xtensa_system_ss = ss.source_set()
 +xtensa_system_ss.add(files(
    'dbg_helper.c',
    'mmu_helper.c',
    'monitor.c',
@@ -XXX,XX +XXX,XX @@ xtensa_softmmu_ss.add(files(
  ))
  target_arch += {'xtensa': xtensa_ss}
 -target_softmmu_arch += {'xtensa': xtensa_softmmu_ss}
 +target_softmmu_arch += {'xtensa': xtensa_system_ss}
 diff --git a/tcg/meson.build b/tcg/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/tcg/meson.build
 +++ b/tcg/meson.build
@@ -XXX,XX +XXX,XX @@ libtcg_softmmu = static_library('tcg_softmmu',
  tcg_softmmu = declare_dependency(link_with: libtcg_softmmu,
                                   dependencies: tcg_ss.dependencies())
 -softmmu_ss.add(tcg_softmmu)
 +system_ss.add(tcg_softmmu)
 diff --git a/trace/meson.build b/trace/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/trace/meson.build
 +++ b/trace/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(files('trace-hmp-cmds.c'))
 +system_ss.add(files('trace-hmp-cmds.c'))
  specific_ss.add(files('control-target.c'))
 diff --git a/ui/meson.build b/ui/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/ui/meson.build
 +++ b/ui/meson.build
@@ -XXX,XX +XXX,XX @@
 -softmmu_ss.add(pixman)
 +system_ss.add(pixman)
  specific_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: pixman)   # for the include path
  specific_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: opengl)   # for the include path
 -softmmu_ss.add(png)
 -softmmu_ss.add(files(
 +system_ss.add(png)
 +system_ss.add(files(
    'clipboard.c',
    'console.c',
    'cursor.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(files(
    'util.c',
  ))
  if dbus_display
 -  softmmu_ss.add(files('dbus-module.c'))
 +  system_ss.add(files('dbus-module.c'))
  endif
 -softmmu_ss.add([spice_headers, files('spice-module.c')])
 -softmmu_ss.add(when: spice_protocol, if_true: files('vdagent.c'))
 +system_ss.add([spice_headers, files('spice-module.c')])
 +system_ss.add(when: spice_protocol, if_true: files('vdagent.c'))
 -softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files(
 +system_ss.add(when: 'CONFIG_LINUX', if_true: files(
    'input-linux.c',
    'udmabuf.c',
  ))
 -softmmu_ss.add(when: cocoa, if_true: files('cocoa.m'))
 +system_ss.add(when: cocoa, if_true: files('cocoa.m'))
  vnc_ss = ss.source_set()
  vnc_ss.add(files(
@@ -XXX,XX +XXX,XX @@ vnc_ss.add(files(
  ))
  vnc_ss.add(zlib, jpeg, gnutls)
  vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c'))
 -softmmu_ss.add_all(when: vnc, if_true: vnc_ss)
 -softmmu_ss.add(when: vnc, if_false: files('vnc-stubs.c'))
 +system_ss.add_all(when: vnc, if_true: vnc_ss)
 +system_ss.add(when: vnc, if_false: files('vnc-stubs.c'))
  ui_modules = {}
@@ -XXX,XX +XXX,XX @@ if curses.found()
    ui_modules += {'curses' : curses_ss}
  endif
 -softmmu_ss.add(opengl)
 +system_ss.add(opengl)
  if opengl.found()
    opengl_ss = ss.source_set()
    opengl_ss.add(gbm)
@@ -XXX,XX +XXX,XX @@ if dbus_display
  endif
  if gtk.found()
 -  softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c'))
 +  system_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c'))
    gtk_ss = ss.source_set()
    gtk_ss.add(gtk, vte, pixman, files('gtk.c'))
@@ -XXX,XX +XXX,XX @@ if gtk.found()
  endif
  if sdl.found()
 -  softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c'))
 +  system_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c'))
    sdl_ss = ss.source_set()
    sdl_ss.add(sdl, sdl_image, pixman, glib, files(
 --
-.20.1
+.34.1

-[PULL 04/16] vl: Reduce scope of variables in configure_accelerators
+[PULL 13/16] plugins: Remove unused 'exec/helper-proto.h' header
-The accel_list and tmp variables are only used when manufacturing
+From: Philippe Mathieu-Daudé <philmd@linaro.org>
 -machine accel, options based on -accel.
-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Reviewed by: Aleksandar Markovic <amarkovic@wavecomp.com>
+Message-Id: <20230611085846.21415-2-philmd@linaro.org>
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- vl.c | 3 ++-
+ plugins/core.c | 1 -
-file changed, 2 insertions(+), 1 deletion(-)
+file changed, 1 deletion(-)
-diff --git a/vl.c b/vl.c
+diff --git a/plugins/core.c b/plugins/core.c
 index XXXXXXX..XXXXXXX 100644
---- a/vl.c
+--- a/plugins/core.c
-+++ b/vl.c
++++ b/plugins/core.c
-@@ -XXX,XX +XXX,XX @@ static int do_configure_accelerator(void *opaque, QemuOpts *opts, Error **errp)
+@@ -XXX,XX +XXX,XX @@
- static void configure_accelerators(const char *progname)
- {
+ #include "exec/exec-all.h"
-     const char *accel;
+ #include "exec/tb-flush.h"
--    char **accel_list, **tmp;
+-#include "exec/helper-proto.h"
-     bool init_failed = false;
+ #include "tcg/tcg.h"
+ #include "tcg/tcg-op.h"
-     qemu_opts_foreach(qemu_find_opts("icount"),
+ #include "plugin.h"
@@ -XXX,XX +XXX,XX @@ static void configure_accelerators(const char *progname)
      accel = qemu_opt_get(qemu_get_machine_opts(), "accel");
      if (QTAILQ_EMPTY(&qemu_accel_opts.head)) {
 +        char **accel_list, **tmp;
 +
          if (accel == NULL) {
              /* Select the default accelerator */
              if (!accel_find("tcg") && !accel_find("kvm")) {
 --
-.20.1
+.34.1

-[PULL 05/16] vl: Remove useless test in configure_accelerators
+[PULL 14/16] accel/tcg/cpu-exec: Use generic 'helper-proto-common.h' header
-The result of g_strsplit is never NULL.
+From: Philippe Mathieu-Daudé <philmd@linaro.org>
-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
+We only need lookup_tb_ptr() prototype.
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Reviewed by: Aleksandar Markovic <amarkovic@wavecomp.com>
+Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
 Message-Id: <20230611085846.21415-3-philmd@linaro.org>
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- vl.c | 2 +-
+ accel/tcg/cpu-exec.c | 2 +-
 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/vl.c b/vl.c
+diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
 index XXXXXXX..XXXXXXX 100644
---- a/vl.c
+--- a/accel/tcg/cpu-exec.c
-+++ b/vl.c
++++ b/accel/tcg/cpu-exec.c
-@@ -XXX,XX +XXX,XX @@ static void configure_accelerators(const char *progname)
+@@ -XXX,XX +XXX,XX @@
+ #include "sysemu/cpu-timers.h"
-         accel_list = g_strsplit(accel, ":", 0);
+ #include "exec/replay-core.h"
+ #include "sysemu/tcg.h"
--        for (tmp = accel_list; tmp && *tmp; tmp++) {
+-#include "exec/helper-proto.h"
-+        for (tmp = accel_list; *tmp; tmp++) {
++#include "exec/helper-proto-common.h"
-             /*
+ #include "tb-jmp-cache.h"
-              * Filter invalid accelerators here, to prevent obscenities
+ #include "tb-hash.h"
-              * such as "-machine accel=tcg,,thread=single".
+ #include "tb-context.h"
 --
-.20.1
+.34.1

-[PULL 03/16] vl: Remove unused variable in configure_accelerators
+[PULL 15/16] exec/cpu-defs: Check for SOFTMMU instead of !USER_ONLY
-The accel_initialised variable no longer has any setters.
+From: Philippe Mathieu-Daudé <philmd@linaro.org>
-Fixes: 6f6e1698a68c
+We want to check the softmmu tlb availability, not
-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
+if we are targetting system emulation. Besides, this
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+code could be used by user emulation in the future.
-Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Reviewed by: Aleksandar Markovic <amarkovic@wavecomp.com>
+Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
 Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
 Message-Id: <20230605230216.17202-1-philmd@linaro.org>
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- vl.c | 3 +--
+ include/exec/cpu-defs.h | 12 ++++++------
-file changed, 1 insertion(+), 2 deletions(-)
+file changed, 6 insertions(+), 6 deletions(-)
-diff --git a/vl.c b/vl.c
+diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h
 index XXXXXXX..XXXXXXX 100644
---- a/vl.c
+--- a/include/exec/cpu-defs.h
-+++ b/vl.c
++++ b/include/exec/cpu-defs.h
-@@ -XXX,XX +XXX,XX @@ static void configure_accelerators(const char *progname)
+@@ -XXX,XX +XXX,XX @@
- {
+  */
-     const char *accel;
+ #define NB_MMU_MODES 16
-     char **accel_list, **tmp;
--    bool accel_initialised = false;
+-#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG)
-     bool init_failed = false;
++#if defined(CONFIG_SOFTMMU) && defined(CONFIG_TCG)
+ #include "exec/tlb-common.h"
-     qemu_opts_foreach(qemu_find_opts("icount"),
-@@ -XXX,XX +XXX,XX @@ static void configure_accelerators(const char *progname)
+ /* use a fully associative victim tlb of 8 entries */
+@@ -XXX,XX +XXX,XX @@
-         accel_list = g_strsplit(accel, ":", 0);
+ #  endif
+ # endif
--        for (tmp = accel_list; !accel_initialised && tmp && *tmp; tmp++) {
-+        for (tmp = accel_list; tmp && *tmp; tmp++) {
+-#endif  /* !CONFIG_USER_ONLY && CONFIG_TCG */
-             /*
++#endif /* CONFIG_SOFTMMU && CONFIG_TCG */
-              * Filter invalid accelerators here, to prevent obscenities
-              * such as "-machine accel=tcg,,thread=single".
+-#if !defined(CONFIG_USER_ONLY)
 +#if defined(CONFIG_SOFTMMU)
  /*
   * The full TLB entry, which is not accessed by generated TCG code,
   * so the layout is not as critical as that of CPUTLBEntry. This is
@@ -XXX,XX +XXX,XX @@ typedef struct CPUTLBEntryFull {
      TARGET_PAGE_ENTRY_EXTRA
  #endif
  } CPUTLBEntryFull;
 -#endif  /* !CONFIG_USER_ONLY */
 +#endif /* CONFIG_SOFTMMU */
 -#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG)
 +#if defined(CONFIG_SOFTMMU) && defined(CONFIG_TCG)
  /*
   * Data elements that are per MMU mode, minus the bits accessed by
   * the TCG fast path.
@@ -XXX,XX +XXX,XX @@ typedef struct CPUTLB {
  typedef struct CPUTLB { } CPUTLB;
 -#endif  /* !CONFIG_USER_ONLY && CONFIG_TCG */
 +#endif /* CONFIG_SOFTMMU && CONFIG_TCG */
  /*
   * This structure must be placed in ArchCPU immediately
 --
-.20.1
+.34.1

-[PULL 02/16] util/cacheinfo: fix crash when compiling with uClibc
+[PULL 16/16] cputlb: Restrict SavedIOTLB to system emulation
-From: Carlos Santos <casantos@redhat.com>
+From: Philippe Mathieu-Daudé <philmd@linaro.org>
-uClibc defines _SC_LEVEL1_ICACHE_LINESIZE and _SC_LEVEL1_DCACHE_LINESIZE
+Commit 2f3a57ee47 ("cputlb: ensure we save the IOTLB data in
-but the corresponding sysconf calls returns -1, which is a valid result,
+case of reset") added the SavedIOTLB structure -- which is
-meaning that the limit is indeterminate.
+system emulation specific -- in the generic CPUState structure.
-Handle this situation using the fallback values instead of crashing due
+Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-to an assertion failure.
+Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
+Message-Id: <20221216215519.5522-3-philmd@linaro.org>
 Signed-off-by: Carlos Santos <casantos@redhat.com>
 Message-Id: <20191017123713.30192-1-casantos@redhat.com>
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- util/cacheinfo.c | 10 ++++++++--
+ include/hw/core/cpu.h | 6 ++++--
-file changed, 8 insertions(+), 2 deletions(-)
+file changed, 4 insertions(+), 2 deletions(-)
-diff --git a/util/cacheinfo.c b/util/cacheinfo.c
+diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
 index XXXXXXX..XXXXXXX 100644
---- a/util/cacheinfo.c
+--- a/include/hw/core/cpu.h
-+++ b/util/cacheinfo.c
++++ b/include/hw/core/cpu.h
-@@ -XXX,XX +XXX,XX @@ static void sys_cache_info(int *isize, int *dsize)
+@@ -XXX,XX +XXX,XX @@ struct CPUWatchpoint {
- static void sys_cache_info(int *isize, int *dsize)
+     QTAILQ_ENTRY(CPUWatchpoint) entry;
- {
+ };
- # ifdef _SC_LEVEL1_ICACHE_LINESIZE
--    *isize = sysconf(_SC_LEVEL1_ICACHE_LINESIZE);
+-#ifdef CONFIG_PLUGIN
-+    int tmp_isize = (int) sysconf(_SC_LEVEL1_ICACHE_LINESIZE);
++#if defined(CONFIG_PLUGIN) && !defined(CONFIG_USER_ONLY)
-+    if (tmp_isize > 0) {
+ /*
-+        *isize = tmp_isize;
+  * For plugins we sometime need to save the resolved iotlb data before
-+    }
+  * the memory regions get moved around  by io_writex.
- # endif
+@@ -XXX,XX +XXX,XX @@ struct CPUState {
- # ifdef _SC_LEVEL1_DCACHE_LINESIZE
--    *dsize = sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
+ #ifdef CONFIG_PLUGIN
-+    int tmp_dsize = (int) sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
+     GArray *plugin_mem_cbs;
-+    if (tmp_dsize > 0) {
++#if !defined(CONFIG_USER_ONLY)
-+        *dsize = tmp_dsize;
+     /* saved iotlb data from io_writex */
-+    }
+     SavedIOTLB saved_iotlb;
- # endif
+-#endif
- }
++#endif /* !CONFIG_USER_ONLY */
- #endif /* sys_cache_info */
++#endif /* CONFIG_PLUGIN */
      /* TODO Move common fields from CPUArchState here. */
      int cpu_index;
 --
-.20.1
+.34.1

The following changes since commit 3e08b2b9cb64bff2b73fa9128c0e49bfcde0dd40:

Merge remote-tracking branch 'remotes/philmd-gitlab/tags/edk2-next-20200121' into staging (2020-01-21 15:29:25 +0000)

are available in the Git repository at:

https://github.com/rth7680/qemu.git tags/pull-tcg-20200121

for you to fetch changes up to 75fa376cdab5e5db2c7fdd107358e16f95503ac6:

scripts/git.orderfile: Display decodetree before C source (2020-01-21 15:26:09 -1000)

----------------------------------------------------------------
Remove another limit to NB_MMU_MODES.
Fix compilation using uclibc.
Fix defaulting of -accel parameters.
Tidy cputlb basic routines.
Adjust git.orderfile for decodetree.

----------------------------------------------------------------
Carlos Santos (1):
      util/cacheinfo: fix crash when compiling with uClibc

Philippe Mathieu-Daudé (1):
      scripts/git.orderfile: Display decodetree before C source

Richard Henderson (14):
      cputlb: Handle NB_MMU_MODES > TARGET_PAGE_BITS_MIN
      vl: Remove unused variable in configure_accelerators
      vl: Reduce scope of variables in configure_accelerators
      vl: Remove useless test in configure_accelerators
      vl: Only choose enabled accelerators in configure_accelerators
      cputlb: Merge tlb_table_flush_by_mmuidx into tlb_flush_one_mmuidx_locked
      cputlb: Make tlb_n_entries private to cputlb.c
      cputlb: Pass CPUTLBDescFast to tlb_n_entries and sizeof_tlb
      cputlb: Hoist tlb portions in tlb_mmu_resize_locked
      cputlb: Hoist tlb portions in tlb_flush_one_mmuidx_locked
      cputlb: Split out tlb_mmu_flush_locked
      cputlb: Partially merge tlb_dyn_init into tlb_init
      cputlb: Initialize tlbs as flushed
      cputlb: Hoist timestamp outside of loops over tlbs

In target/arm we will shortly have "too many" mmu_idx.
The current minimum barrier is caused by the way in which
tlb_flush_page_by_mmuidx is coded.

We can remove this limitation by allocating memory for
consumption by the worker.  Let us assume that this is
the unlikely case, as will be the case for the majority
of targets which have so far satisfied the BUILD_BUG_ON,
and only allocate memory when necessary.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 accel/tcg/cputlb.c | 167 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 132 insertions(+), 35 deletions(-)

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index XXXXXXX..XXXXXXX 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -XXX,XX +XXX,XX @@ static void tlb_flush_page_locked(CPUArchState *env, int midx,
     }
 }
 
-/* As we are going to hijack the bottom bits of the page address for a
- * mmuidx bit mask we need to fail to build if we can't do that
+/**
+ * tlb_flush_page_by_mmuidx_async_0:
+ * @cpu: cpu on which to flush
+ * @addr: page of virtual address to flush
+ * @idxmap: set of mmu_idx to flush
+ *
+ * Helper for tlb_flush_page_by_mmuidx and friends, flush one page
+ * at @addr from the tlbs indicated by @idxmap from @cpu.
  */
-QEMU_BUILD_BUG_ON(NB_MMU_MODES > TARGET_PAGE_BITS_MIN);
-
-static void tlb_flush_page_by_mmuidx_async_work(CPUState *cpu,
-                                                run_on_cpu_data data)
+static void tlb_flush_page_by_mmuidx_async_0(CPUState *cpu,
+                                             target_ulong addr,
+                                             uint16_t idxmap)
 {
     CPUArchState *env = cpu->env_ptr;
-    target_ulong addr_and_mmuidx = (target_ulong) data.target_ptr;
-    target_ulong addr = addr_and_mmuidx & TARGET_PAGE_MASK;
-    unsigned long mmu_idx_bitmap = addr_and_mmuidx & ALL_MMUIDX_BITS;
     int mmu_idx;
 
     assert_cpu_is_self(cpu);
 
-    tlb_debug("page addr:" TARGET_FMT_lx " mmu_map:0x%lx\n",
-              addr, mmu_idx_bitmap);
+    tlb_debug("page addr:" TARGET_FMT_lx " mmu_map:0x%x\n", addr, idxmap);
 
     qemu_spin_lock(&env_tlb(env)->c.lock);
     for (mmu_idx = 0; mmu_idx < NB_MMU_MODES; mmu_idx++) {
-        if (test_bit(mmu_idx, &mmu_idx_bitmap)) {
+        if ((idxmap >> mmu_idx) & 1) {
             tlb_flush_page_locked(env, mmu_idx, addr);
         }
     }
@@ -XXX,XX +XXX,XX @@ static void tlb_flush_page_by_mmuidx_async_work(CPUState *cpu,
     tb_flush_jmp_cache(cpu, addr);
 }
 
+/**
+ * tlb_flush_page_by_mmuidx_async_1:
+ * @cpu: cpu on which to flush
+ * @data: encoded addr + idxmap
+ *
+ * Helper for tlb_flush_page_by_mmuidx and friends, called through
+ * async_run_on_cpu.  The idxmap parameter is encoded in the page
+ * offset of the target_ptr field.  This limits the set of mmu_idx
+ * that can be passed via this method.
+ */
+static void tlb_flush_page_by_mmuidx_async_1(CPUState *cpu,
+                                             run_on_cpu_data data)
+{
+    target_ulong addr_and_idxmap = (target_ulong) data.target_ptr;
+    target_ulong addr = addr_and_idxmap & TARGET_PAGE_MASK;
+    uint16_t idxmap = addr_and_idxmap & ~TARGET_PAGE_MASK;
+
+    tlb_flush_page_by_mmuidx_async_0(cpu, addr, idxmap);
+}
+
+typedef struct {
+    target_ulong addr;
+    uint16_t idxmap;
+} TLBFlushPageByMMUIdxData;
+
+/**
+ * tlb_flush_page_by_mmuidx_async_2:
+ * @cpu: cpu on which to flush
+ * @data: allocated addr + idxmap
+ *
+ * Helper for tlb_flush_page_by_mmuidx and friends, called through
+ * async_run_on_cpu.  The addr+idxmap parameters are stored in a
+ * TLBFlushPageByMMUIdxData structure that has been allocated
+ * specifically for this helper.  Free the structure when done.
+ */
+static void tlb_flush_page_by_mmuidx_async_2(CPUState *cpu,
+                                             run_on_cpu_data data)
+{
+    TLBFlushPageByMMUIdxData *d = data.host_ptr;
+
+    tlb_flush_page_by_mmuidx_async_0(cpu, d->addr, d->idxmap);
+    g_free(d);
+}
+
 void tlb_flush_page_by_mmuidx(CPUState *cpu, target_ulong addr, uint16_t idxmap)
 {
-    target_ulong addr_and_mmu_idx;
-
     tlb_debug("addr: "TARGET_FMT_lx" mmu_idx:%" PRIx16 "\n", addr, idxmap);
 
     /* This should already be page aligned */
-    addr_and_mmu_idx = addr & TARGET_PAGE_MASK;
-    addr_and_mmu_idx |= idxmap;
+    addr &= TARGET_PAGE_MASK;
 
-    if (!qemu_cpu_is_self(cpu)) {
-        async_run_on_cpu(cpu, tlb_flush_page_by_mmuidx_async_work,
-                         RUN_ON_CPU_TARGET_PTR(addr_and_mmu_idx));
+    if (qemu_cpu_is_self(cpu)) {
+        tlb_flush_page_by_mmuidx_async_0(cpu, addr, idxmap);
+    } else if (idxmap < TARGET_PAGE_SIZE) {
+        /*
+         * Most targets have only a few mmu_idx.  In the case where
+         * we can stuff idxmap into the low TARGET_PAGE_BITS, avoid
+         * allocating memory for this operation.
+         */
+        async_run_on_cpu(cpu, tlb_flush_page_by_mmuidx_async_1,
+                         RUN_ON_CPU_TARGET_PTR(addr | idxmap));
     } else {
-        tlb_flush_page_by_mmuidx_async_work(
-            cpu, RUN_ON_CPU_TARGET_PTR(addr_and_mmu_idx));
+        TLBFlushPageByMMUIdxData *d = g_new(TLBFlushPageByMMUIdxData, 1);
+
+        /* Otherwise allocate a structure, freed by the worker.  */
+        d->addr = addr;
+        d->idxmap = idxmap;
+        async_run_on_cpu(cpu, tlb_flush_page_by_mmuidx_async_2,
+                         RUN_ON_CPU_HOST_PTR(d));
     }
 }
 
@@ -XXX,XX +XXX,XX @@ void tlb_flush_page(CPUState *cpu, target_ulong addr)
 void tlb_flush_page_by_mmuidx_all_cpus(CPUState *src_cpu, target_ulong addr,
                                        uint16_t idxmap)
 {
-    const run_on_cpu_func fn = tlb_flush_page_by_mmuidx_async_work;
-    target_ulong addr_and_mmu_idx;
-
     tlb_debug("addr: "TARGET_FMT_lx" mmu_idx:%"PRIx16"\n", addr, idxmap);
 
     /* This should already be page aligned */
-    addr_and_mmu_idx = addr & TARGET_PAGE_MASK;
-    addr_and_mmu_idx |= idxmap;
+    addr &= TARGET_PAGE_MASK;
 
-    flush_all_helper(src_cpu, fn, RUN_ON_CPU_TARGET_PTR(addr_and_mmu_idx));
-    fn(src_cpu, RUN_ON_CPU_TARGET_PTR(addr_and_mmu_idx));
+    /*
+     * Allocate memory to hold addr+idxmap only when needed.
+     * See tlb_flush_page_by_mmuidx for details.
+     */
+    if (idxmap < TARGET_PAGE_SIZE) {
+        flush_all_helper(src_cpu, tlb_flush_page_by_mmuidx_async_1,
+                         RUN_ON_CPU_TARGET_PTR(addr | idxmap));
+    } else {
+        CPUState *dst_cpu;
+
+        /* Allocate a separate data block for each destination cpu.  */
+        CPU_FOREACH(dst_cpu) {
+            if (dst_cpu != src_cpu) {
+                TLBFlushPageByMMUIdxData *d
+                    = g_new(TLBFlushPageByMMUIdxData, 1);
+
+                d->addr = addr;
+                d->idxmap = idxmap;
+                async_run_on_cpu(dst_cpu, tlb_flush_page_by_mmuidx_async_2,
+                                 RUN_ON_CPU_HOST_PTR(d));
+            }
+        }
+    }
+
+    tlb_flush_page_by_mmuidx_async_0(src_cpu, addr, idxmap);
 }
 
 void tlb_flush_page_all_cpus(CPUState *src, target_ulong addr)
@@ -XXX,XX +XXX,XX @@ void tlb_flush_page_by_mmuidx_all_cpus_synced(CPUState *src_cpu,
                                               target_ulong addr,
                                               uint16_t idxmap)
 {
-    const run_on_cpu_func fn = tlb_flush_page_by_mmuidx_async_work;
-    target_ulong addr_and_mmu_idx;
-
     tlb_debug("addr: "TARGET_FMT_lx" mmu_idx:%"PRIx16"\n", addr, idxmap);
 
     /* This should already be page aligned */
-    addr_and_mmu_idx = addr & TARGET_PAGE_MASK;
-    addr_and_mmu_idx |= idxmap;
+    addr &= TARGET_PAGE_MASK;
 
-    flush_all_helper(src_cpu, fn, RUN_ON_CPU_TARGET_PTR(addr_and_mmu_idx));
-    async_safe_run_on_cpu(src_cpu, fn, RUN_ON_CPU_TARGET_PTR(addr_and_mmu_idx));
+    /*
+     * Allocate memory to hold addr+idxmap only when needed.
+     * See tlb_flush_page_by_mmuidx for details.
+     */
+    if (idxmap < TARGET_PAGE_SIZE) {
+        flush_all_helper(src_cpu, tlb_flush_page_by_mmuidx_async_1,
+                         RUN_ON_CPU_TARGET_PTR(addr | idxmap));
+        async_safe_run_on_cpu(src_cpu, tlb_flush_page_by_mmuidx_async_1,
+                              RUN_ON_CPU_TARGET_PTR(addr | idxmap));
+    } else {
+        CPUState *dst_cpu;
+        TLBFlushPageByMMUIdxData *d;
+
+        /* Allocate a separate data block for each destination cpu.  */
+        CPU_FOREACH(dst_cpu) {
+            if (dst_cpu != src_cpu) {
+                d = g_new(TLBFlushPageByMMUIdxData, 1);
+                d->addr = addr;
+                d->idxmap = idxmap;
+                async_run_on_cpu(dst_cpu, tlb_flush_page_by_mmuidx_async_2,
+                                 RUN_ON_CPU_HOST_PTR(d));
+            }
+        }
+
+        d = g_new(TLBFlushPageByMMUIdxData, 1);
+        d->addr = addr;
+        d->idxmap = idxmap;
+        async_safe_run_on_cpu(src_cpu, tlb_flush_page_by_mmuidx_async_2,
+                              RUN_ON_CPU_HOST_PTR(d));
+    }
 }
 
 void tlb_flush_page_all_cpus_synced(CPUState *src, target_ulong addr)
-- 
2.20.1

From: Carlos Santos <casantos@redhat.com>

uClibc defines _SC_LEVEL1_ICACHE_LINESIZE and _SC_LEVEL1_DCACHE_LINESIZE
but the corresponding sysconf calls returns -1, which is a valid result,
meaning that the limit is indeterminate.

Handle this situation using the fallback values instead of crashing due
to an assertion failure.

Signed-off-by: Carlos Santos <casantos@redhat.com>
Message-Id: <20191017123713.30192-1-casantos@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 util/cacheinfo.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/util/cacheinfo.c b/util/cacheinfo.c
index XXXXXXX..XXXXXXX 100644
--- a/util/cacheinfo.c
+++ b/util/cacheinfo.c
@@ -XXX,XX +XXX,XX @@ static void sys_cache_info(int *isize, int *dsize)
 static void sys_cache_info(int *isize, int *dsize)
 {
 # ifdef _SC_LEVEL1_ICACHE_LINESIZE
-    *isize = sysconf(_SC_LEVEL1_ICACHE_LINESIZE);
+    int tmp_isize = (int) sysconf(_SC_LEVEL1_ICACHE_LINESIZE);
+    if (tmp_isize > 0) {
+        *isize = tmp_isize;
+    }
 # endif
 # ifdef _SC_LEVEL1_DCACHE_LINESIZE
-    *dsize = sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
+    int tmp_dsize = (int) sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
+    if (tmp_dsize > 0) {
+        *dsize = tmp_dsize;
+    }
 # endif
 }
 #endif /* sys_cache_info */
-- 
2.20.1

The accel_initialised variable no longer has any setters.

Fixes: 6f6e1698a68c
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed by: Aleksandar Markovic <amarkovic@wavecomp.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 vl.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/vl.c b/vl.c
index XXXXXXX..XXXXXXX 100644
--- a/vl.c
+++ b/vl.c
@@ -XXX,XX +XXX,XX @@ static void configure_accelerators(const char *progname)
 {
     const char *accel;
     char **accel_list, **tmp;
-    bool accel_initialised = false;
     bool init_failed = false;
 
     qemu_opts_foreach(qemu_find_opts("icount"),
@@ -XXX,XX +XXX,XX @@ static void configure_accelerators(const char *progname)
 
         accel_list = g_strsplit(accel, ":", 0);
 
-        for (tmp = accel_list; !accel_initialised && tmp && *tmp; tmp++) {
+        for (tmp = accel_list; tmp && *tmp; tmp++) {
             /*
              * Filter invalid accelerators here, to prevent obscenities
              * such as "-machine accel=tcg,,thread=single".
-- 
2.20.1

The accel_list and tmp variables are only used when manufacturing
-machine accel, options based on -accel.

Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed by: Aleksandar Markovic <amarkovic@wavecomp.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 vl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vl.c b/vl.c
index XXXXXXX..XXXXXXX 100644
--- a/vl.c
+++ b/vl.c
@@ -XXX,XX +XXX,XX @@ static int do_configure_accelerator(void *opaque, QemuOpts *opts, Error **errp)
 static void configure_accelerators(const char *progname)
 {
     const char *accel;
-    char **accel_list, **tmp;
     bool init_failed = false;
 
     qemu_opts_foreach(qemu_find_opts("icount"),
@@ -XXX,XX +XXX,XX @@ static void configure_accelerators(const char *progname)
 
     accel = qemu_opt_get(qemu_get_machine_opts(), "accel");
     if (QTAILQ_EMPTY(&qemu_accel_opts.head)) {
+        char **accel_list, **tmp;
+
         if (accel == NULL) {
             /* Select the default accelerator */
             if (!accel_find("tcg") && !accel_find("kvm")) {
-- 
2.20.1

By choosing "tcg:kvm" when kvm is not enabled, we generate
an incorrect warning: "invalid accelerator kvm".

At the same time, use g_str_has_suffix rather than open-coding
the same operation.

Presumably the inverse is also true with --disable-tcg.

Fixes: 28a0961757fc
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed by: Aleksandar Markovic <amarkovic@wavecomp.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 vl.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/vl.c b/vl.c
index XXXXXXX..XXXXXXX 100644
--- a/vl.c
+++ b/vl.c
@@ -XXX,XX +XXX,XX @@ static void configure_accelerators(const char *progname)
 
         if (accel == NULL) {
             /* Select the default accelerator */
-            if (!accel_find("tcg") && !accel_find("kvm")) {
-                error_report("No accelerator selected and"
-                             " no default accelerator available");
-                exit(1);
-            } else {
-                int pnlen = strlen(progname);
-                if (pnlen >= 3 && g_str_equal(&progname[pnlen - 3], "kvm")) {
+            bool have_tcg = accel_find("tcg");
+            bool have_kvm = accel_find("kvm");
+
+            if (have_tcg && have_kvm) {
+                if (g_str_has_suffix(progname, "kvm")) {
                     /* If the program name ends with "kvm", we prefer KVM */
                     accel = "kvm:tcg";
                 } else {
                     accel = "tcg:kvm";
                 }
+            } else if (have_kvm) {
+                accel = "kvm";
+            } else if (have_tcg) {
+                accel = "tcg";
+            } else {
+                error_report("No accelerator selected and"
+                             " no default accelerator available");
+                exit(1);
             }
         }
-
         accel_list = g_strsplit(accel, ":", 0);
 
         for (tmp = accel_list; *tmp; tmp++) {
-- 
2.20.1

There is only one caller for tlb_table_flush_by_mmuidx.  Place
the result at the earlier line number, due to an expected user
in the near future.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 accel/tcg/cputlb.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index XXXXXXX..XXXXXXX 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -XXX,XX +XXX,XX @@ static void tlb_mmu_resize_locked(CPUArchState *env, int mmu_idx)
     }
 }
 
-static inline void tlb_table_flush_by_mmuidx(CPUArchState *env, int mmu_idx)
+static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
 {
     tlb_mmu_resize_locked(env, mmu_idx);
-    memset(env_tlb(env)->f[mmu_idx].table, -1, sizeof_tlb(env, mmu_idx));
     env_tlb(env)->d[mmu_idx].n_used_entries = 0;
+    env_tlb(env)->d[mmu_idx].large_page_addr = -1;
+    env_tlb(env)->d[mmu_idx].large_page_mask = -1;
+    env_tlb(env)->d[mmu_idx].vindex = 0;
+    memset(env_tlb(env)->f[mmu_idx].table, -1, sizeof_tlb(env, mmu_idx));
+    memset(env_tlb(env)->d[mmu_idx].vtable, -1,
+           sizeof(env_tlb(env)->d[0].vtable));
 }
 
 static inline void tlb_n_used_entries_inc(CPUArchState *env, uintptr_t mmu_idx)
@@ -XXX,XX +XXX,XX @@ void tlb_flush_counts(size_t *pfull, size_t *ppart, size_t *pelide)
     *pelide = elide;
 }
 
-static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
-{
-    tlb_table_flush_by_mmuidx(env, mmu_idx);
-    env_tlb(env)->d[mmu_idx].large_page_addr = -1;
-    env_tlb(env)->d[mmu_idx].large_page_mask = -1;
-    env_tlb(env)->d[mmu_idx].vindex = 0;
-    memset(env_tlb(env)->d[mmu_idx].vtable, -1,
-           sizeof(env_tlb(env)->d[0].vtable));
-}
-
 static void tlb_flush_by_mmuidx_async_work(CPUState *cpu, run_on_cpu_data data)
 {
     CPUArchState *env = cpu->env_ptr;
-- 
2.20.1

There are no users of this function outside cputlb.c,
and its interface will change in the next patch.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 include/exec/cpu_ldst.h | 5 -----
 accel/tcg/cputlb.c      | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index XXXXXXX..XXXXXXX 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -XXX,XX +XXX,XX @@ static inline uintptr_t tlb_index(CPUArchState *env, uintptr_t mmu_idx,
     return (addr >> TARGET_PAGE_BITS) & size_mask;
 }
 
-static inline size_t tlb_n_entries(CPUArchState *env, uintptr_t mmu_idx)
-{
-    return (env_tlb(env)->f[mmu_idx].mask >> CPU_TLB_ENTRY_BITS) + 1;
-}
-
 /* Find the TLB entry corresponding to the mmu_idx + address pair.  */
 static inline CPUTLBEntry *tlb_entry(CPUArchState *env, uintptr_t mmu_idx,
                                      target_ulong addr)
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index XXXXXXX..XXXXXXX 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -XXX,XX +XXX,XX @@ QEMU_BUILD_BUG_ON(sizeof(target_ulong) > sizeof(run_on_cpu_data));
 QEMU_BUILD_BUG_ON(NB_MMU_MODES > 16);
 #define ALL_MMUIDX_BITS ((1 << NB_MMU_MODES) - 1)
 
+static inline size_t tlb_n_entries(CPUArchState *env, uintptr_t mmu_idx)
+{
+    return (env_tlb(env)->f[mmu_idx].mask >> CPU_TLB_ENTRY_BITS) + 1;
+}
+
 static inline size_t sizeof_tlb(CPUArchState *env, uintptr_t mmu_idx)
 {
     return env_tlb(env)->f[mmu_idx].mask + (1 << CPU_TLB_ENTRY_BITS);
-- 
2.20.1

We do not need the entire CPUArchState to compute these values.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 accel/tcg/cputlb.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index XXXXXXX..XXXXXXX 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -XXX,XX +XXX,XX @@ QEMU_BUILD_BUG_ON(sizeof(target_ulong) > sizeof(run_on_cpu_data));
 QEMU_BUILD_BUG_ON(NB_MMU_MODES > 16);
 #define ALL_MMUIDX_BITS ((1 << NB_MMU_MODES) - 1)
 
-static inline size_t tlb_n_entries(CPUArchState *env, uintptr_t mmu_idx)
+static inline size_t tlb_n_entries(CPUTLBDescFast *fast)
 {
-    return (env_tlb(env)->f[mmu_idx].mask >> CPU_TLB_ENTRY_BITS) + 1;
+    return (fast->mask >> CPU_TLB_ENTRY_BITS) + 1;
 }
 
-static inline size_t sizeof_tlb(CPUArchState *env, uintptr_t mmu_idx)
+static inline size_t sizeof_tlb(CPUTLBDescFast *fast)
 {
-    return env_tlb(env)->f[mmu_idx].mask + (1 << CPU_TLB_ENTRY_BITS);
+    return fast->mask + (1 << CPU_TLB_ENTRY_BITS);
 }
 
 static void tlb_window_reset(CPUTLBDesc *desc, int64_t ns,
@@ -XXX,XX +XXX,XX @@ static void tlb_dyn_init(CPUArchState *env)
 static void tlb_mmu_resize_locked(CPUArchState *env, int mmu_idx)
 {
     CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];
-    size_t old_size = tlb_n_entries(env, mmu_idx);
+    size_t old_size = tlb_n_entries(&env_tlb(env)->f[mmu_idx]);
     size_t rate;
     size_t new_size = old_size;
     int64_t now = get_clock_realtime();
@@ -XXX,XX +XXX,XX @@ static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
     env_tlb(env)->d[mmu_idx].large_page_addr = -1;
     env_tlb(env)->d[mmu_idx].large_page_mask = -1;
     env_tlb(env)->d[mmu_idx].vindex = 0;
-    memset(env_tlb(env)->f[mmu_idx].table, -1, sizeof_tlb(env, mmu_idx));
+    memset(env_tlb(env)->f[mmu_idx].table, -1,
+           sizeof_tlb(&env_tlb(env)->f[mmu_idx]));
     memset(env_tlb(env)->d[mmu_idx].vtable, -1,
            sizeof(env_tlb(env)->d[0].vtable));
 }
@@ -XXX,XX +XXX,XX @@ void tlb_reset_dirty(CPUState *cpu, ram_addr_t start1, ram_addr_t length)
     qemu_spin_lock(&env_tlb(env)->c.lock);
     for (mmu_idx = 0; mmu_idx < NB_MMU_MODES; mmu_idx++) {
         unsigned int i;
-        unsigned int n = tlb_n_entries(env, mmu_idx);
+        unsigned int n = tlb_n_entries(&env_tlb(env)->f[mmu_idx]);
 
         for (i = 0; i < n; i++) {
             tlb_reset_dirty_range_locked(&env_tlb(env)->f[mmu_idx].table[i],
-- 
2.20.1

No functional change, but the smaller expressions make
the code easier to read.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 accel/tcg/cputlb.c | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index XXXXXXX..XXXXXXX 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -XXX,XX +XXX,XX @@ static void tlb_dyn_init(CPUArchState *env)
 
 /**
  * tlb_mmu_resize_locked() - perform TLB resize bookkeeping; resize if necessary
- * @env: CPU that owns the TLB
- * @mmu_idx: MMU index of the TLB
+ * @desc: The CPUTLBDesc portion of the TLB
+ * @fast: The CPUTLBDescFast portion of the same TLB
  *
  * Called with tlb_lock_held.
  *
@@ -XXX,XX +XXX,XX @@ static void tlb_dyn_init(CPUArchState *env)
  * high), since otherwise we are likely to have a significant amount of
  * conflict misses.
  */
-static void tlb_mmu_resize_locked(CPUArchState *env, int mmu_idx)
+static void tlb_mmu_resize_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)
 {
-    CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];
-    size_t old_size = tlb_n_entries(&env_tlb(env)->f[mmu_idx]);
+    size_t old_size = tlb_n_entries(fast);
     size_t rate;
     size_t new_size = old_size;
     int64_t now = get_clock_realtime();
@@ -XXX,XX +XXX,XX @@ static void tlb_mmu_resize_locked(CPUArchState *env, int mmu_idx)
         return;
     }
 
-    g_free(env_tlb(env)->f[mmu_idx].table);
-    g_free(env_tlb(env)->d[mmu_idx].iotlb);
+    g_free(fast->table);
+    g_free(desc->iotlb);
 
     tlb_window_reset(desc, now, 0);
     /* desc->n_used_entries is cleared by the caller */
-    env_tlb(env)->f[mmu_idx].mask = (new_size - 1) << CPU_TLB_ENTRY_BITS;
-    env_tlb(env)->f[mmu_idx].table = g_try_new(CPUTLBEntry, new_size);
-    env_tlb(env)->d[mmu_idx].iotlb = g_try_new(CPUIOTLBEntry, new_size);
+    fast->mask = (new_size - 1) << CPU_TLB_ENTRY_BITS;
+    fast->table = g_try_new(CPUTLBEntry, new_size);
+    desc->iotlb = g_try_new(CPUIOTLBEntry, new_size);
+
     /*
      * If the allocations fail, try smaller sizes. We just freed some
      * memory, so going back to half of new_size has a good chance of working.
@@ -XXX,XX +XXX,XX @@ static void tlb_mmu_resize_locked(CPUArchState *env, int mmu_idx)
      * allocations to fail though, so we progressively reduce the allocation
      * size, aborting if we cannot even allocate the smallest TLB we support.
      */
-    while (env_tlb(env)->f[mmu_idx].table == NULL ||
-           env_tlb(env)->d[mmu_idx].iotlb == NULL) {
+    while (fast->table == NULL || desc->iotlb == NULL) {
         if (new_size == (1 << CPU_TLB_DYN_MIN_BITS)) {
             error_report("%s: %s", __func__, strerror(errno));
             abort();
         }
         new_size = MAX(new_size >> 1, 1 << CPU_TLB_DYN_MIN_BITS);
-        env_tlb(env)->f[mmu_idx].mask = (new_size - 1) << CPU_TLB_ENTRY_BITS;
+        fast->mask = (new_size - 1) << CPU_TLB_ENTRY_BITS;
 
-        g_free(env_tlb(env)->f[mmu_idx].table);
-        g_free(env_tlb(env)->d[mmu_idx].iotlb);
-        env_tlb(env)->f[mmu_idx].table = g_try_new(CPUTLBEntry, new_size);
-        env_tlb(env)->d[mmu_idx].iotlb = g_try_new(CPUIOTLBEntry, new_size);
+        g_free(fast->table);
+        g_free(desc->iotlb);
+        fast->table = g_try_new(CPUTLBEntry, new_size);
+        desc->iotlb = g_try_new(CPUIOTLBEntry, new_size);
     }
 }
 
 static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
 {
-    tlb_mmu_resize_locked(env, mmu_idx);
+    tlb_mmu_resize_locked(&env_tlb(env)->d[mmu_idx], &env_tlb(env)->f[mmu_idx]);
     env_tlb(env)->d[mmu_idx].n_used_entries = 0;
     env_tlb(env)->d[mmu_idx].large_page_addr = -1;
     env_tlb(env)->d[mmu_idx].large_page_mask = -1;
-- 
2.20.1

No functional change, but the smaller expressions make
the code easier to read.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 accel/tcg/cputlb.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index XXXXXXX..XXXXXXX 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -XXX,XX +XXX,XX @@ static void tlb_mmu_resize_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)
 
 static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
 {
-    tlb_mmu_resize_locked(&env_tlb(env)->d[mmu_idx], &env_tlb(env)->f[mmu_idx]);
-    env_tlb(env)->d[mmu_idx].n_used_entries = 0;
-    env_tlb(env)->d[mmu_idx].large_page_addr = -1;
-    env_tlb(env)->d[mmu_idx].large_page_mask = -1;
-    env_tlb(env)->d[mmu_idx].vindex = 0;
-    memset(env_tlb(env)->f[mmu_idx].table, -1,
-           sizeof_tlb(&env_tlb(env)->f[mmu_idx]));
-    memset(env_tlb(env)->d[mmu_idx].vtable, -1,
-           sizeof(env_tlb(env)->d[0].vtable));
+    CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];
+    CPUTLBDescFast *fast = &env_tlb(env)->f[mmu_idx];
+
+    tlb_mmu_resize_locked(desc, fast);
+    desc->n_used_entries = 0;
+    desc->large_page_addr = -1;
+    desc->large_page_mask = -1;
+    desc->vindex = 0;
+    memset(fast->table, -1, sizeof_tlb(fast));
+    memset(desc->vtable, -1, sizeof(desc->vtable));
 }
 
 static inline void tlb_n_used_entries_inc(CPUArchState *env, uintptr_t mmu_idx)
-- 
2.20.1

We will want to be able to flush a tlb without resizing.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 accel/tcg/cputlb.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index XXXXXXX..XXXXXXX 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -XXX,XX +XXX,XX @@ static void tlb_mmu_resize_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)
     }
 }
 
-static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
+static void tlb_mmu_flush_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)
 {
-    CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];
-    CPUTLBDescFast *fast = &env_tlb(env)->f[mmu_idx];
-
-    tlb_mmu_resize_locked(desc, fast);
     desc->n_used_entries = 0;
     desc->large_page_addr = -1;
     desc->large_page_mask = -1;
@@ -XXX,XX +XXX,XX @@ static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
     memset(desc->vtable, -1, sizeof(desc->vtable));
 }
 
+static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
+{
+    CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];
+    CPUTLBDescFast *fast = &env_tlb(env)->f[mmu_idx];
+
+    tlb_mmu_resize_locked(desc, fast);
+    tlb_mmu_flush_locked(desc, fast);
+}
+
 static inline void tlb_n_used_entries_inc(CPUArchState *env, uintptr_t mmu_idx)
 {
     env_tlb(env)->d[mmu_idx].n_used_entries++;
-- 
2.20.1

Merge into the only caller, but at the same time split
out tlb_mmu_init to initialize a single tlb entry.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 accel/tcg/cputlb.c | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index XXXXXXX..XXXXXXX 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -XXX,XX +XXX,XX @@ static void tlb_window_reset(CPUTLBDesc *desc, int64_t ns,
     desc->window_max_entries = max_entries;
 }
 
-static void tlb_dyn_init(CPUArchState *env)
-{
-    int i;
-
-    for (i = 0; i < NB_MMU_MODES; i++) {
-        CPUTLBDesc *desc = &env_tlb(env)->d[i];
-        size_t n_entries = 1 << CPU_TLB_DYN_DEFAULT_BITS;
-
-        tlb_window_reset(desc, get_clock_realtime(), 0);
-        desc->n_used_entries = 0;
-        env_tlb(env)->f[i].mask = (n_entries - 1) << CPU_TLB_ENTRY_BITS;
-        env_tlb(env)->f[i].table = g_new(CPUTLBEntry, n_entries);
-        env_tlb(env)->d[i].iotlb = g_new(CPUIOTLBEntry, n_entries);
-    }
-}
-
 /**
  * tlb_mmu_resize_locked() - perform TLB resize bookkeeping; resize if necessary
  * @desc: The CPUTLBDesc portion of the TLB
@@ -XXX,XX +XXX,XX @@ static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
     tlb_mmu_flush_locked(desc, fast);
 }
 
+static void tlb_mmu_init(CPUTLBDesc *desc, CPUTLBDescFast *fast, int64_t now)
+{
+    size_t n_entries = 1 << CPU_TLB_DYN_DEFAULT_BITS;
+
+    tlb_window_reset(desc, now, 0);
+    desc->n_used_entries = 0;
+    fast->mask = (n_entries - 1) << CPU_TLB_ENTRY_BITS;
+    fast->table = g_new(CPUTLBEntry, n_entries);
+    desc->iotlb = g_new(CPUIOTLBEntry, n_entries);
+}
+
 static inline void tlb_n_used_entries_inc(CPUArchState *env, uintptr_t mmu_idx)
 {
     env_tlb(env)->d[mmu_idx].n_used_entries++;
@@ -XXX,XX +XXX,XX @@ static inline void tlb_n_used_entries_dec(CPUArchState *env, uintptr_t mmu_idx)
 void tlb_init(CPUState *cpu)
 {
     CPUArchState *env = cpu->env_ptr;
+    int64_t now = get_clock_realtime();
+    int i;
 
     qemu_spin_init(&env_tlb(env)->c.lock);
 
     /* Ensure that cpu_reset performs a full flush.  */
     env_tlb(env)->c.dirty = ALL_MMUIDX_BITS;
 
-    tlb_dyn_init(env);
+    for (i = 0; i < NB_MMU_MODES; i++) {
+        tlb_mmu_init(&env_tlb(env)->d[i], &env_tlb(env)->f[i], now);
+    }
 }
 
 /* flush_all_helper: run fn across all cpus
-- 
2.20.1

There's little point in leaving these data structures half initialized,
and relying on a flush to be done during reset.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 accel/tcg/cputlb.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index XXXXXXX..XXXXXXX 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -XXX,XX +XXX,XX @@ static void tlb_mmu_init(CPUTLBDesc *desc, CPUTLBDescFast *fast, int64_t now)
     fast->mask = (n_entries - 1) << CPU_TLB_ENTRY_BITS;
     fast->table = g_new(CPUTLBEntry, n_entries);
     desc->iotlb = g_new(CPUIOTLBEntry, n_entries);
+    tlb_mmu_flush_locked(desc, fast);
 }
 
 static inline void tlb_n_used_entries_inc(CPUArchState *env, uintptr_t mmu_idx)
@@ -XXX,XX +XXX,XX @@ void tlb_init(CPUState *cpu)
 
     qemu_spin_init(&env_tlb(env)->c.lock);
 
-    /* Ensure that cpu_reset performs a full flush.  */
-    env_tlb(env)->c.dirty = ALL_MMUIDX_BITS;
+    /* All tlbs are initialized flushed. */
+    env_tlb(env)->c.dirty = 0;
 
     for (i = 0; i < NB_MMU_MODES; i++) {
         tlb_mmu_init(&env_tlb(env)->d[i], &env_tlb(env)->f[i], now);
-- 
2.20.1

Do not call get_clock_realtime() in tlb_mmu_resize_locked,
but hoist outside of any loop over a set of tlbs.  This is
only two (indirect) callers, tlb_flush_by_mmuidx_async_work
and tlb_flush_page_locked, so not onerous.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 accel/tcg/cputlb.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index XXXXXXX..XXXXXXX 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -XXX,XX +XXX,XX @@ static void tlb_window_reset(CPUTLBDesc *desc, int64_t ns,
  * high), since otherwise we are likely to have a significant amount of
  * conflict misses.
  */
-static void tlb_mmu_resize_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)
+static void tlb_mmu_resize_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast,
+                                  int64_t now)
 {
     size_t old_size = tlb_n_entries(fast);
     size_t rate;
     size_t new_size = old_size;
-    int64_t now = get_clock_realtime();
     int64_t window_len_ms = 100;
     int64_t window_len_ns = window_len_ms * 1000 * 1000;
     bool window_expired = now > desc->window_begin_ns + window_len_ns;
@@ -XXX,XX +XXX,XX @@ static void tlb_mmu_flush_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)
     memset(desc->vtable, -1, sizeof(desc->vtable));
 }
 
-static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
+static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx,
+                                        int64_t now)
 {
     CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];
     CPUTLBDescFast *fast = &env_tlb(env)->f[mmu_idx];
 
-    tlb_mmu_resize_locked(desc, fast);
+    tlb_mmu_resize_locked(desc, fast, now);
     tlb_mmu_flush_locked(desc, fast);
 }
 
@@ -XXX,XX +XXX,XX @@ static void tlb_flush_by_mmuidx_async_work(CPUState *cpu, run_on_cpu_data data)
     CPUArchState *env = cpu->env_ptr;
     uint16_t asked = data.host_int;
     uint16_t all_dirty, work, to_clean;
+    int64_t now = get_clock_realtime();
 
     assert_cpu_is_self(cpu);
 
@@ -XXX,XX +XXX,XX @@ static void tlb_flush_by_mmuidx_async_work(CPUState *cpu, run_on_cpu_data data)
 
     for (work = to_clean; work != 0; work &= work - 1) {
         int mmu_idx = ctz32(work);
-        tlb_flush_one_mmuidx_locked(env, mmu_idx);
+        tlb_flush_one_mmuidx_locked(env, mmu_idx, now);
     }
 
     qemu_spin_unlock(&env_tlb(env)->c.lock);
@@ -XXX,XX +XXX,XX @@ static void tlb_flush_page_locked(CPUArchState *env, int midx,
         tlb_debug("forcing full flush midx %d ("
                   TARGET_FMT_lx "/" TARGET_FMT_lx ")\n",
                   midx, lp_addr, lp_mask);
-        tlb_flush_one_mmuidx_locked(env, midx);
+        tlb_flush_one_mmuidx_locked(env, midx, get_clock_realtime());
     } else {
         if (tlb_flush_entry_locked(tlb_entry(env, midx, page), page)) {
             tlb_n_used_entries_dec(env, midx);
-- 
2.20.1

The following changes since commit 48ab886d3da4f3ab94f79f6c0f8b4535b446bbfd:

Merge tag 'pull-target-arm-20230619' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2023-06-19 16:32:25 +0200)

are available in the Git repository at:

https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20230620

for you to fetch changes up to d7ee93e24359703debf4137f4cc632563aa4e8d1:

cputlb: Restrict SavedIOTLB to system emulation (2023-06-20 10:02:14 +0200)

----------------------------------------------------------------
tcg: Define _CALL_AIX for clang on ppc64
accel/tcg: Build fix for macos catalina
accel/tcg: Handle MO_ATOM_WITHIN16 in do_st16_leN
accel/tcg: Restrict SavedIOTLB to system emulation
accel/tcg: Use generic 'helper-proto-common.h' header
plugins: Remove unused 'exec/helper-proto.h' header
*: Check for CONFIG_USER_ONLY instead of CONFIG_SOFTMMU

----------------------------------------------------------------
Philippe Mathieu-Daudé (13):
      target/i386: Simplify i386_tr_init_disas_context()
      target/tricore: Remove pointless CONFIG_SOFTMMU guard
      target/m68k: Check for USER_ONLY definition instead of SOFTMMU one
      target/ppc: Check for USER_ONLY definition instead of SOFTMMU one
      hw/core/cpu: Check for USER_ONLY definition instead of SOFTMMU one
      accel/tcg: Check for USER_ONLY definition instead of SOFTMMU one
      meson: Alias CONFIG_SOFTMMU -> CONFIG_SYSTEM_ONLY
      meson: Replace CONFIG_SOFTMMU -> CONFIG_SYSTEM_ONLY
      meson: Replace softmmu_ss -> system_ss
      plugins: Remove unused 'exec/helper-proto.h' header
      accel/tcg/cpu-exec: Use generic 'helper-proto-common.h' header
      exec/cpu-defs: Check for SOFTMMU instead of !USER_ONLY
      cputlb: Restrict SavedIOTLB to system emulation

Richard Henderson (3):
      host/include/x86_64: Use __m128i for "x" constraints
      accel/tcg: Handle MO_ATOM_WITHIN16 in do_st16_leN
      tcg/ppc: Define _CALL_AIX for clang on ppc64(be)

The macOS catalina compiler produces an error for __int128_t
as the type for allocation with SSE inline asm constraint.
Create a new X86Int128Union type and use the vector type for
all SSE register inputs and outputs.

Tested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 host/include/x86_64/host/atomic128-ldst.h     | 25 ++++++++++++-------
 .../x86_64/host/load-extract-al16-al8.h       |  8 +++---
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/host/include/x86_64/host/atomic128-ldst.h b/host/include/x86_64/host/atomic128-ldst.h
index XXXXXXX..XXXXXXX 100644
--- a/host/include/x86_64/host/atomic128-ldst.h
+++ b/host/include/x86_64/host/atomic128-ldst.h
@@ -XXX,XX +XXX,XX @@
  * atomic primitive is meant to provide.
  */
 
-#ifndef AARCH64_ATOMIC128_LDST_H
-#define AARCH64_ATOMIC128_LDST_H
+#ifndef X86_64_ATOMIC128_LDST_H
+#define X86_64_ATOMIC128_LDST_H
 
 #ifdef CONFIG_INT128_TYPE
 #include "host/cpuinfo.h"
 #include "tcg/debug-assert.h"
+#include <immintrin.h>
+
+typedef union {
+    __m128i v;
+    __int128_t i;
+    Int128 s;
+} X86Int128Union;
 
 /*
  * Through clang 16, with -mcx16, __atomic_load_n is incorrectly
@@ -XXX,XX +XXX,XX @@
 
 static inline Int128 atomic16_read_ro(const Int128 *ptr)
 {
-    Int128Alias r;
+    X86Int128Union r;
 
     tcg_debug_assert(HAVE_ATOMIC128_RO);
-    asm("vmovdqa %1, %0" : "=x" (r.i) : "m" (*ptr));
+    asm("vmovdqa %1, %0" : "=x" (r.v) : "m" (*ptr));
 
     return r.s;
 }
@@ -XXX,XX +XXX,XX @@ static inline Int128 atomic16_read_ro(const Int128 *ptr)
 static inline Int128 atomic16_read_rw(Int128 *ptr)
 {
     __int128_t *ptr_align = __builtin_assume_aligned(ptr, 16);
-    Int128Alias r;
+    X86Int128Union r;
 
     if (HAVE_ATOMIC128_RO) {
-        asm("vmovdqa %1, %0" : "=x" (r.i) : "m" (*ptr_align));
+        asm("vmovdqa %1, %0" : "=x" (r.v) : "m" (*ptr_align));
     } else {
         r.i = __sync_val_compare_and_swap_16(ptr_align, 0, 0);
     }
@@ -XXX,XX +XXX,XX @@ static inline Int128 atomic16_read_rw(Int128 *ptr)
 static inline void atomic16_set(Int128 *ptr, Int128 val)
 {
     __int128_t *ptr_align = __builtin_assume_aligned(ptr, 16);
-    Int128Alias new = { .s = val };
+    X86Int128Union new = { .s = val };
 
     if (HAVE_ATOMIC128_RO) {
-        asm("vmovdqa %1, %0" : "=m"(*ptr_align) : "x" (new.i));
+        asm("vmovdqa %1, %0" : "=m"(*ptr_align) : "x" (new.v));
     } else {
         __int128_t old;
         do {
@@ -XXX,XX +XXX,XX @@ static inline void atomic16_set(Int128 *ptr, Int128 val)
 #include "host/include/generic/host/atomic128-ldst.h"
 #endif
 
-#endif /* AARCH64_ATOMIC128_LDST_H */
+#endif /* X86_64_ATOMIC128_LDST_H */
diff --git a/host/include/x86_64/host/load-extract-al16-al8.h b/host/include/x86_64/host/load-extract-al16-al8.h
index XXXXXXX..XXXXXXX 100644
--- a/host/include/x86_64/host/load-extract-al16-al8.h
+++ b/host/include/x86_64/host/load-extract-al16-al8.h
@@ -XXX,XX +XXX,XX @@
 #define X86_64_LOAD_EXTRACT_AL16_AL8_H
 
 #ifdef CONFIG_INT128_TYPE
-#include "host/cpuinfo.h"
+#include "host/atomic128-ldst.h"
 
 /**
  * load_atom_extract_al16_or_al8:
@@ -XXX,XX +XXX,XX @@ load_atom_extract_al16_or_al8(void *pv, int s)
     uintptr_t pi = (uintptr_t)pv;
     __int128_t *ptr_align = (__int128_t *)(pi & ~7);
     int shr = (pi & 7) * 8;
-    Int128Alias r;
+    X86Int128Union r;
 
     /*
      * ptr_align % 16 is now only 0 or 8.
@@ -XXX,XX +XXX,XX @@ load_atom_extract_al16_or_al8(void *pv, int s)
      * when ptr_align % 16 == 0 for 16-byte atomicity.
      */
     if ((cpuinfo & CPUINFO_ATOMIC_VMOVDQU) || (pi & 8)) {
-        asm("vmovdqu %1, %0" : "=x" (r.i) : "m" (*ptr_align));
+        asm("vmovdqu %1, %0" : "=x" (r.v) : "m" (*ptr_align));
     } else {
-        asm("vmovdqa %1, %0" : "=x" (r.i) : "m" (*ptr_align));
+        asm("vmovdqa %1, %0" : "=x" (r.v) : "m" (*ptr_align));
     }
     return int128_getlo(int128_urshift(r.s, shr));
 }
-- 
2.34.1

Restructure the ifdef ladder, separating 64-bit from 32-bit,
and ensure _CALL_AIX is set for ELF v1.  Fixes the build for
ppc64 big-endian host with clang.

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 tcg/ppc/tcg-target.c.inc | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc
index XXXXXXX..XXXXXXX 100644
--- a/tcg/ppc/tcg-target.c.inc
+++ b/tcg/ppc/tcg-target.c.inc
@@ -XXX,XX +XXX,XX @@
 /*
  * Standardize on the _CALL_FOO symbols used by GCC:
  * Apple XCode does not define _CALL_DARWIN.
- * Clang defines _CALL_ELF (64-bit) but not _CALL_SYSV (32-bit).
+ * Clang defines _CALL_ELF (64-bit) but not _CALL_SYSV or _CALL_AIX.
  */
-#if !defined(_CALL_SYSV) && \
-    !defined(_CALL_DARWIN) && \
-    !defined(_CALL_AIX) && \
-    !defined(_CALL_ELF)
-# if defined(__APPLE__)
+#if TCG_TARGET_REG_BITS == 64
+# ifdef _CALL_AIX
+    /* ok */
+# elif defined(_CALL_ELF) && _CALL_ELF == 1
+#  define _CALL_AIX
+# elif defined(_CALL_ELF) && _CALL_ELF == 2
+    /* ok */
+# else
+#  error "Unknown ABI"
+# endif
+#else
+# if defined(_CALL_SYSV) || defined(_CALL_DARWIN)
+    /* ok */
+# elif defined(__APPLE__)
 #  define _CALL_DARWIN
-# elif defined(__ELF__) && TCG_TARGET_REG_BITS == 32
+# elif defined(__ELF__)
 #  define _CALL_SYSV
 # else
 #  error "Unknown ABI"
-- 
2.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Since cpu_mmu_index() is well-defined for user-only,
we can remove the surrounding #ifdef'ry entirely.

Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230613133347.82210-2-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/i386/tcg/translate.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
index XXXXXXX..XXXXXXX 100644
--- a/target/i386/tcg/translate.c
+++ b/target/i386/tcg/translate.c
@@ -XXX,XX +XXX,XX @@ static void i386_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cpu)
     dc->cc_op_dirty = false;
     dc->popl_esp_hack = 0;
     /* select memory access functions */
-    dc->mem_index = 0;
-#ifdef CONFIG_SOFTMMU
     dc->mem_index = cpu_mmu_index(env, false);
-#endif
     dc->cpuid_features = env->features[FEAT_1_EDX];
     dc->cpuid_ext_features = env->features[FEAT_1_ECX];
     dc->cpuid_ext2_features = env->features[FEAT_8000_0001_EDX];
-- 
2.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

We don't build any user emulation target for Tricore,
only the system emulation. No need to check for it as
it is always defined.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-Id: <20230613133347.82210-3-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/tricore/helper.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/target/tricore/helper.c b/target/tricore/helper.c
index XXXXXXX..XXXXXXX 100644
--- a/target/tricore/helper.c
+++ b/target/tricore/helper.c
@@ -XXX,XX +XXX,XX @@ enum {
     TLBRET_MATCH = 0
 };
 
-#if defined(CONFIG_SOFTMMU)
 static int get_physical_address(CPUTriCoreState *env, hwaddr *physical,
                                 int *prot, target_ulong address,
                                 MMUAccessType access_type, int mmu_idx)
@@ -XXX,XX +XXX,XX @@ hwaddr tricore_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)
     }
     return phys_addr;
 }
-#endif
 
 /* TODO: Add exeption support*/
 static void raise_mmu_exception(CPUTriCoreState *env, target_ulong address,
-- 
2.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Since we *might* have user emulation with softmmu,
replace the system emulation check by !user emulation one.

Invert some if() ladders for clarity.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230613133347.82210-4-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/m68k/helper.h    |  2 +-
 target/m68k/cpu.c       | 14 ++++++--------
 target/m68k/helper.c    |  4 ++--
 target/m68k/translate.c | 28 ++++++++++++++--------------
 4 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/target/m68k/helper.h b/target/m68k/helper.h
index XXXXXXX..XXXXXXX 100644
--- a/target/m68k/helper.h
+++ b/target/m68k/helper.h
@@ -XXX,XX +XXX,XX @@ DEF_HELPER_FLAGS_4(bfffo_mem, TCG_CALL_NO_WG, i64, env, i32, s32, i32)
 DEF_HELPER_3(chk, void, env, s32, s32)
 DEF_HELPER_4(chk2, void, env, s32, s32, s32)
 
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
 DEF_HELPER_3(ptest, void, env, i32, i32)
 DEF_HELPER_3(pflush, void, env, i32, i32)
 DEF_HELPER_FLAGS_1(reset, TCG_CALL_NO_RWG, void, env)
diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c
index XXXXXXX..XXXXXXX 100644
--- a/target/m68k/cpu.c
+++ b/target/m68k/cpu.c
@@ -XXX,XX +XXX,XX @@ static void m68k_cpu_reset_hold(Object *obj)
     }
 
     memset(env, 0, offsetof(CPUM68KState, end_reset_fields));
-#ifdef CONFIG_SOFTMMU
-    cpu_m68k_set_sr(env, SR_S | SR_I);
-#else
+#ifdef CONFIG_USER_ONLY
     cpu_m68k_set_sr(env, 0);
+#else
+    cpu_m68k_set_sr(env, SR_S | SR_I);
 #endif
     for (i = 0; i < 8; i++) {
         env->fregs[i].d = nan;
@@ -XXX,XX +XXX,XX @@ static void m68k_cpu_initfn(Object *obj)
     cpu_set_cpustate_pointers(cpu);
 }
 
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
 static bool fpu_needed(void *opaque)
 {
     M68kCPU *s = opaque;
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_m68k_cpu = {
         NULL
     },
 };
-#endif
 
-#ifndef CONFIG_USER_ONLY
 #include "hw/core/sysemu-cpu-ops.h"
 
 static const struct SysemuCPUOps m68k_sysemu_ops = {
     .get_phys_page_debug = m68k_cpu_get_phys_page_debug,
 };
-#endif
+#endif /* !CONFIG_USER_ONLY */
 
 #include "hw/core/tcg-cpu-ops.h"
 
@@ -XXX,XX +XXX,XX @@ static void m68k_cpu_class_init(ObjectClass *c, void *data)
     cc->get_pc = m68k_cpu_get_pc;
     cc->gdb_read_register = m68k_cpu_gdb_read_register;
     cc->gdb_write_register = m68k_cpu_gdb_write_register;
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
     dc->vmsd = &vmstate_m68k_cpu;
     cc->sysemu_ops = &m68k_sysemu_ops;
 #endif
diff --git a/target/m68k/helper.c b/target/m68k/helper.c
index XXXXXXX..XXXXXXX 100644
--- a/target/m68k/helper.c
+++ b/target/m68k/helper.c
@@ -XXX,XX +XXX,XX @@ void HELPER(set_mac_extu)(CPUM68KState *env, uint32_t val, uint32_t acc)
     env->macc[acc + 1] = res;
 }
 
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
 void HELPER(ptest)(CPUM68KState *env, uint32_t addr, uint32_t is_read)
 {
     hwaddr physical;
@@ -XXX,XX +XXX,XX @@ void HELPER(reset)(CPUM68KState *env)
 {
     /* FIXME: reset all except CPU */
 }
-#endif
+#endif /* !CONFIG_USER_ONLY */
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index XXXXXXX..XXXXXXX 100644
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -XXX,XX +XXX,XX @@ DISAS_INSN(swap)
 
 DISAS_INSN(bkpt)
 {
-#if defined(CONFIG_SOFTMMU)
-    gen_exception(s, s->base.pc_next, EXCP_ILLEGAL);
-#else
+#if defined(CONFIG_USER_ONLY)
     gen_exception(s, s->base.pc_next, EXCP_DEBUG);
+#else
+    gen_exception(s, s->base.pc_next, EXCP_ILLEGAL);
 #endif
 }
 
@@ -XXX,XX +XXX,XX @@ DISAS_INSN(unlk)
     tcg_gen_addi_i32(QREG_SP, src, 4);
 }
 
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
 DISAS_INSN(reset)
 {
     if (IS_USER(s)) {
@@ -XXX,XX +XXX,XX @@ DISAS_INSN(move_from_sr)
     DEST_EA(env, insn, OS_WORD, sr, NULL);
 }
 
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
 DISAS_INSN(moves)
 {
     int opsize;
@@ -XXX,XX +XXX,XX @@ DISAS_INSN(cinv)
     /* Invalidate cache line.  Implement as no-op.  */
 }
 
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
 DISAS_INSN(pflush)
 {
     TCGv opmode;
@@ -XXX,XX +XXX,XX @@ DISAS_INSN(ftrapcc)
     do_trapcc(s, &c);
 }
 
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
 DISAS_INSN(frestore)
 {
     TCGv addr;
@@ -XXX,XX +XXX,XX @@ void register_m68k_insns (CPUM68KState *env)
     BASE(bitop_im,  08c0, ffc0);
     INSN(arith_im,  0a80, fff8, CF_ISA_A);
     INSN(arith_im,  0a00, ff00, M68K);
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
     INSN(moves,     0e00, ff00, M68K);
 #endif
     INSN(cas,       0ac0, ffc0, CAS);
@@ -XXX,XX +XXX,XX @@ void register_m68k_insns (CPUM68KState *env)
     BASE(move_to_ccr, 44c0, ffc0);
     INSN(not,       4680, fff8, CF_ISA_A);
     INSN(not,       4600, ff00, M68K);
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
     BASE(move_to_sr, 46c0, ffc0);
 #endif
     INSN(nbcd,      4800, ffc0, M68K);
@@ -XXX,XX +XXX,XX @@ void register_m68k_insns (CPUM68KState *env)
     BASE(tst,       4a00, ff00);
     INSN(tas,       4ac0, ffc0, CF_ISA_B);
     INSN(tas,       4ac0, ffc0, M68K);
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
     INSN(halt,      4ac8, ffff, CF_ISA_A);
     INSN(halt,      4ac8, ffff, M68K);
 #endif
@@ -XXX,XX +XXX,XX @@ void register_m68k_insns (CPUM68KState *env)
     BASE(trap,      4e40, fff0);
     BASE(link,      4e50, fff8);
     BASE(unlk,      4e58, fff8);
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
     INSN(move_to_usp, 4e60, fff8, USP);
     INSN(move_from_usp, 4e68, fff8, USP);
     INSN(reset,     4e70, ffff, M68K);
@@ -XXX,XX +XXX,XX @@ void register_m68k_insns (CPUM68KState *env)
     INSN(ftrapcc,   f27a, fffe, FPU);       /* opmode 010, 011 */
     INSN(ftrapcc,   f27c, ffff, FPU);       /* opmode 100 */
     INSN(fbcc,      f280, ff80, FPU);
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
     INSN(frestore,  f340, ffc0, CF_FPU);
     INSN(fsave,     f300, ffc0, CF_FPU);
     INSN(frestore,  f340, ffc0, FPU);
@@ -XXX,XX +XXX,XX @@ void m68k_cpu_dump_state(CPUState *cs, FILE *f, int flags)
         break;
     }
     qemu_fprintf(f, "\n");
-#ifdef CONFIG_SOFTMMU
+#ifndef CONFIG_USER_ONLY
     qemu_fprintf(f, "%sA7(MSP) = %08x %sA7(USP) = %08x %sA7(ISP) = %08x\n",
                  env->current_sp == M68K_SSP ? "->" : "  ", env->sp[M68K_SSP],
                  env->current_sp == M68K_USP ? "->" : "  ", env->sp[M68K_USP],
@@ -XXX,XX +XXX,XX @@ void m68k_cpu_dump_state(CPUState *cs, FILE *f, int flags)
                  env->mmu.ttr[M68K_ITTR0], env->mmu.ttr[M68K_ITTR1]);
     qemu_fprintf(f, "MMUSR %08x, fault at %08x\n",
                  env->mmu.mmusr, env->mmu.ar);
-#endif
+#endif /* !CONFIG_USER_ONLY */
 }
-- 
2.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Since we *might* have user emulation with softmmu,
replace the system emulation check by !user emulation one.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Message-Id: <20230613133347.82210-5-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/ppc/cpu_init.c    | 20 ++++++++++----------
 target/ppc/helper_regs.c |  6 ++----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
index XXXXXXX..XXXXXXX 100644
--- a/target/ppc/cpu_init.c
+++ b/target/ppc/cpu_init.c
@@ -XXX,XX +XXX,XX @@ POWERPC_FAMILY(970)(ObjectClass *oc, void *data)
                     (1ull << MSR_PMM) |
                     (1ull << MSR_RI);
     pcc->mmu_model = POWERPC_MMU_64B;
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
     pcc->hash64_opts = &ppc_hash64_opts_basic;
 #endif
     pcc->excp_model = POWERPC_EXCP_970;
@@ -XXX,XX +XXX,XX @@ POWERPC_FAMILY(POWER5P)(ObjectClass *oc, void *data)
     pcc->lpcr_mask = LPCR_RMLS | LPCR_ILE | LPCR_LPES0 | LPCR_LPES1 |
         LPCR_RMI | LPCR_HDICE;
     pcc->mmu_model = POWERPC_MMU_2_03;
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
     pcc->hash64_opts = &ppc_hash64_opts_basic;
     pcc->lrg_decr_bits = 32;
 #endif
@@ -XXX,XX +XXX,XX @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data)
         LPCR_LPES0 | LPCR_LPES1 | LPCR_HDICE;
     pcc->lpcr_pm = LPCR_P7_PECE0 | LPCR_P7_PECE1 | LPCR_P7_PECE2;
     pcc->mmu_model = POWERPC_MMU_2_06;
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
     pcc->hash64_opts = &ppc_hash64_opts_POWER7;
     pcc->lrg_decr_bits = 32;
 #endif
@@ -XXX,XX +XXX,XX @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data)
     pcc->lpcr_pm = LPCR_P8_PECE0 | LPCR_P8_PECE1 | LPCR_P8_PECE2 |
                    LPCR_P8_PECE3 | LPCR_P8_PECE4;
     pcc->mmu_model = POWERPC_MMU_2_07;
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
     pcc->hash64_opts = &ppc_hash64_opts_POWER7;
     pcc->lrg_decr_bits = 32;
     pcc->n_host_threads = 8;
@@ -XXX,XX +XXX,XX @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data)
     pcc->l1_icache_size = 0x8000;
 }
 
-#ifdef CONFIG_SOFTMMU
+#ifndef CONFIG_USER_ONLY
 /*
  * Radix pg sizes and AP encodings for dt node ibm,processor-radix-AP-encodings
  * Encoded as array of int_32s in the form:
@@ -XXX,XX +XXX,XX @@ static struct ppc_radix_page_info POWER9_radix_page_info = {
         0x4000001e  /*  1G - enc: 0x2 */
     }
 };
-#endif /* CONFIG_SOFTMMU */
+#endif /* CONFIG_USER_ONLY */
 
 static void init_proc_POWER9(CPUPPCState *env)
 {
@@ -XXX,XX +XXX,XX @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)
         LPCR_HEIC | LPCR_LPES0 | LPCR_HVICE | LPCR_HDICE;
     pcc->lpcr_pm = LPCR_PDEE | LPCR_HDEE | LPCR_EEE | LPCR_DEE | LPCR_OEE;
     pcc->mmu_model = POWERPC_MMU_3_00;
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
     /* segment page size remain the same */
     pcc->hash64_opts = &ppc_hash64_opts_POWER7;
     pcc->radix_page_info = &POWER9_radix_page_info;
@@ -XXX,XX +XXX,XX @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)
     pcc->l1_icache_size = 0x8000;
 }
 
-#ifdef CONFIG_SOFTMMU
+#ifndef CONFIG_USER_ONLY
 /*
  * Radix pg sizes and AP encodings for dt node ibm,processor-radix-AP-encodings
  * Encoded as array of int_32s in the form:
@@ -XXX,XX +XXX,XX @@ static struct ppc_radix_page_info POWER10_radix_page_info = {
         0x4000001e  /*  1G - enc: 0x2 */
     }
 };
-#endif /* CONFIG_SOFTMMU */
+#endif /* !CONFIG_USER_ONLY */
 
 static void init_proc_POWER10(CPUPPCState *env)
 {
@@ -XXX,XX +XXX,XX @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data)
 
     pcc->lpcr_pm = LPCR_PDEE | LPCR_HDEE | LPCR_EEE | LPCR_DEE | LPCR_OEE;
     pcc->mmu_model = POWERPC_MMU_3_00;
-#if defined(CONFIG_SOFTMMU)
+#if !defined(CONFIG_USER_ONLY)
     /* segment page size remain the same */
     pcc->hash64_opts = &ppc_hash64_opts_POWER7;
     pcc->radix_page_info = &POWER10_radix_page_info;
diff --git a/target/ppc/helper_regs.c b/target/ppc/helper_regs.c
index XXXXXXX..XXXXXXX 100644
--- a/target/ppc/helper_regs.c
+++ b/target/ppc/helper_regs.c
@@ -XXX,XX +XXX,XX @@ int hreg_store_msr(CPUPPCState *env, target_ulong value, int alter_hv)
     return excp;
 }
 
-#ifdef CONFIG_SOFTMMU
+#ifndef CONFIG_USER_ONLY
 void store_40x_sler(CPUPPCState *env, uint32_t val)
 {
     /* XXX: TO BE FIXED */
@@ -XXX,XX +XXX,XX @@ void store_40x_sler(CPUPPCState *env, uint32_t val)
     }
     env->spr[SPR_405_SLER] = val;
 }
-#endif /* CONFIG_SOFTMMU */
 
-#ifndef CONFIG_USER_ONLY
 void check_tlb_flush(CPUPPCState *env, bool global)
 {
     CPUState *cs = env_cpu(env);
@@ -XXX,XX +XXX,XX @@ void check_tlb_flush(CPUPPCState *env, bool global)
         tlb_flush(cs);
     }
 }
-#endif
+#endif /* !CONFIG_USER_ONLY */
 
 /**
  * _spr_register
-- 
2.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Since we *might* have user emulation with softmmu,
replace the system emulation check by !user emulation one.

Invert the #ifdef'ry in TCGCPUOps structure for clarity.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230613133347.82210-6-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 include/hw/core/cpu.h         |   4 +-
 include/hw/core/tcg-cpu-ops.h | 102 +++++++++++++++++-----------------
 2 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -XXX,XX +XXX,XX @@ void page_size_init(void);
 
 #ifdef NEED_CPU_H
 
-#ifdef CONFIG_SOFTMMU
+#ifndef CONFIG_USER_ONLY
 
 extern const VMStateDescription vmstate_cpu_common;
 
@@ -XXX,XX +XXX,XX @@ extern const VMStateDescription vmstate_cpu_common;
     .flags = VMS_STRUCT,                                                    \
     .offset = 0,                                                            \
 }
-#endif /* CONFIG_SOFTMMU */
+#endif /* !CONFIG_USER_ONLY */
 
 #endif /* NEED_CPU_H */
 
diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/core/tcg-cpu-ops.h
+++ b/include/hw/core/tcg-cpu-ops.h
@@ -XXX,XX +XXX,XX @@ struct TCGCPUOps {
      */
     void (*do_interrupt)(CPUState *cpu);
 #endif /* !CONFIG_USER_ONLY || !TARGET_I386 */
-#ifdef CONFIG_SOFTMMU
+#ifdef CONFIG_USER_ONLY
+    /**
+     * record_sigsegv:
+     * @cpu: cpu context
+     * @addr: faulting guest address
+     * @access_type: access was read/write/execute
+     * @maperr: true for invalid page, false for permission fault
+     * @ra: host pc for unwinding
+     *
+     * We are about to raise SIGSEGV with si_code set for @maperr,
+     * and si_addr set for @addr.  Record anything further needed
+     * for the signal ucontext_t.
+     *
+     * If the emulated kernel does not provide anything to the signal
+     * handler with anything besides the user context registers, and
+     * the siginfo_t, then this hook need do nothing and may be omitted.
+     * Otherwise, record the data and return; the caller will raise
+     * the signal, unwind the cpu state, and return to the main loop.
+     *
+     * If it is simpler to re-use the sysemu tlb_fill code, @ra is provided
+     * so that a "normal" cpu exception can be raised.  In this case,
+     * the signal must be raised by the architecture cpu_loop.
+     */
+    void (*record_sigsegv)(CPUState *cpu, vaddr addr,
+                           MMUAccessType access_type,
+                           bool maperr, uintptr_t ra);
+    /**
+     * record_sigbus:
+     * @cpu: cpu context
+     * @addr: misaligned guest address
+     * @access_type: access was read/write/execute
+     * @ra: host pc for unwinding
+     *
+     * We are about to raise SIGBUS with si_code BUS_ADRALN,
+     * and si_addr set for @addr.  Record anything further needed
+     * for the signal ucontext_t.
+     *
+     * If the emulated kernel does not provide the signal handler with
+     * anything besides the user context registers, and the siginfo_t,
+     * then this hook need do nothing and may be omitted.
+     * Otherwise, record the data and return; the caller will raise
+     * the signal, unwind the cpu state, and return to the main loop.
+     *
+     * If it is simpler to re-use the sysemu do_unaligned_access code,
+     * @ra is provided so that a "normal" cpu exception can be raised.
+     * In this case, the signal must be raised by the architecture cpu_loop.
+     */
+    void (*record_sigbus)(CPUState *cpu, vaddr addr,
+                          MMUAccessType access_type, uintptr_t ra);
+#else
     /** @cpu_exec_interrupt: Callback for processing interrupts in cpu_exec */
     bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request);
     /**
@@ -XXX,XX +XXX,XX @@ struct TCGCPUOps {
      */
     bool (*io_recompile_replay_branch)(CPUState *cpu,
                                        const TranslationBlock *tb);
-#else
-    /**
-     * record_sigsegv:
-     * @cpu: cpu context
-     * @addr: faulting guest address
-     * @access_type: access was read/write/execute
-     * @maperr: true for invalid page, false for permission fault
-     * @ra: host pc for unwinding
-     *
-     * We are about to raise SIGSEGV with si_code set for @maperr,
-     * and si_addr set for @addr.  Record anything further needed
-     * for the signal ucontext_t.
-     *
-     * If the emulated kernel does not provide anything to the signal
-     * handler with anything besides the user context registers, and
-     * the siginfo_t, then this hook need do nothing and may be omitted.
-     * Otherwise, record the data and return; the caller will raise
-     * the signal, unwind the cpu state, and return to the main loop.
-     *
-     * If it is simpler to re-use the sysemu tlb_fill code, @ra is provided
-     * so that a "normal" cpu exception can be raised.  In this case,
-     * the signal must be raised by the architecture cpu_loop.
-     */
-    void (*record_sigsegv)(CPUState *cpu, vaddr addr,
-                           MMUAccessType access_type,
-                           bool maperr, uintptr_t ra);
-    /**
-     * record_sigbus:
-     * @cpu: cpu context
-     * @addr: misaligned guest address
-     * @access_type: access was read/write/execute
-     * @ra: host pc for unwinding
-     *
-     * We are about to raise SIGBUS with si_code BUS_ADRALN,
-     * and si_addr set for @addr.  Record anything further needed
-     * for the signal ucontext_t.
-     *
-     * If the emulated kernel does not provide the signal handler with
-     * anything besides the user context registers, and the siginfo_t,
-     * then this hook need do nothing and may be omitted.
-     * Otherwise, record the data and return; the caller will raise
-     * the signal, unwind the cpu state, and return to the main loop.
-     *
-     * If it is simpler to re-use the sysemu do_unaligned_access code,
-     * @ra is provided so that a "normal" cpu exception can be raised.
-     * In this case, the signal must be raised by the architecture cpu_loop.
-     */
-    void (*record_sigbus)(CPUState *cpu, vaddr addr,
-                          MMUAccessType access_type, uintptr_t ra);
-#endif /* CONFIG_SOFTMMU */
+#endif /* !CONFIG_USER_ONLY */
 #endif /* NEED_CPU_H */
 
 };
-- 
2.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Since we *might* have user emulation with softmmu,
replace the system emulation check by !user emulation one.

Invert some if() ladders for clarity.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230613133347.82210-7-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 accel/tcg/internal.h | 6 +++---
 accel/tcg/cpu-exec.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/accel/tcg/internal.h b/accel/tcg/internal.h
index XXXXXXX..XXXXXXX 100644
--- a/accel/tcg/internal.h
+++ b/accel/tcg/internal.h
@@ -XXX,XX +XXX,XX @@
  * memory related structures are protected with mmap_lock.
  * In !user-mode we use per-page locks.
  */
-#ifdef CONFIG_SOFTMMU
-#define assert_memory_lock()
-#else
+#ifdef CONFIG_USER_ONLY
 #define assert_memory_lock() tcg_debug_assert(have_mmap_lock())
+#else
+#define assert_memory_lock()
 #endif
 
 #if defined(CONFIG_SOFTMMU) && defined(CONFIG_DEBUG_TCG)
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index XXXXXXX..XXXXXXX 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -XXX,XX +XXX,XX @@ void cpu_exec_step_atomic(CPUState *cpu)
         cpu_tb_exec(cpu, tb, &tb_exit);
         cpu_exec_exit(cpu);
     } else {
-#ifndef CONFIG_SOFTMMU
+#ifdef CONFIG_USER_ONLY
         clear_helper_retaddr();
         if (have_mmap_lock()) {
             mmap_unlock();
@@ -XXX,XX +XXX,XX @@ static int cpu_exec_setjmp(CPUState *cpu, SyncClocks *sc)
         /* Non-buggy compilers preserve this; assert the correct value. */
         g_assert(cpu == current_cpu);
 
-#ifndef CONFIG_SOFTMMU
+#ifdef CONFIG_USER_ONLY
         clear_helper_retaddr();
         if (have_mmap_lock()) {
             mmap_unlock();
-- 
2.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Since we *might* have user emulation with softmmu,
use the clearer 'CONFIG_SYSTEM_ONLY' key to check
for system emulation.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230613133347.82210-9-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 meson.build                        | 4 ++--
 accel/qtest/meson.build            | 2 +-
 accel/stubs/meson.build            | 2 +-
 accel/tcg/meson.build              | 6 +++---
 dump/meson.build                   | 2 +-
 hw/i386/kvm/meson.build            | 2 +-
 migration/meson.build              | 2 +-
 monitor/meson.build                | 2 +-
 qapi/meson.build                   | 2 +-
 semihosting/meson.build            | 2 +-
 softmmu/meson.build                | 4 ++--
 target/i386/tcg/sysemu/meson.build | 2 +-
 ui/meson.build                     | 4 ++--
 13 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/meson.build b/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/meson.build
+++ b/meson.build
@@ -XXX,XX +XXX,XX @@ config_all += config_host
 config_all += config_all_disas
 config_all += {
   'CONFIG_XEN': xen.found(),
-  'CONFIG_SOFTMMU': have_system,
+  'CONFIG_SYSTEM_ONLY': have_system,
   'CONFIG_USER_ONLY': have_user,
   'CONFIG_ALL': true,
 }
@@ -XXX,XX +XXX,XX @@ endif
 softmmu_ss.add(authz, blockdev, chardev, crypto, io, qmp)
 common_ss.add(qom, qemuutil)
 
-common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: [softmmu_ss])
+common_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: [softmmu_ss])
 common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss)
 
 common_all = common_ss.apply(config_all, strict: false)
diff --git a/accel/qtest/meson.build b/accel/qtest/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/accel/qtest/meson.build
+++ b/accel/qtest/meson.build
@@ -1 +1 @@
-qtest_module_ss.add(when: ['CONFIG_SOFTMMU'], if_true: files('qtest.c'))
+qtest_module_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: files('qtest.c'))
diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/accel/stubs/meson.build
+++ b/accel/stubs/meson.build
@@ -XXX,XX +XXX,XX @@ sysemu_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c'))
 sysemu_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c'))
 sysemu_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c'))
 
-specific_ss.add_all(when: ['CONFIG_SOFTMMU'], if_true: sysemu_stubs_ss)
+specific_ss.add_all(when: ['CONFIG_SYSTEM_ONLY'], if_true: sysemu_stubs_ss)
diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/accel/tcg/meson.build
+++ b/accel/tcg/meson.build
@@ -XXX,XX +XXX,XX @@ tcg_ss.add(files(
   'translator.c',
 ))
 tcg_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c'))
-tcg_ss.add(when: 'CONFIG_SOFTMMU', if_false: files('user-exec-stub.c'))
+tcg_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_false: files('user-exec-stub.c'))
 tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: [files('plugin-gen.c')])
 tcg_ss.add(when: libdw, if_true: files('debuginfo.c'))
 tcg_ss.add(when: 'CONFIG_LINUX', if_true: files('perf.c'))
 specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss)
 
-specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files(
+specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
   'cputlb.c',
   'monitor.c',
 ))
 
-tcg_module_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files(
+tcg_module_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
   'tcg-accel-ops.c',
   'tcg-accel-ops-mttcg.c',
   'tcg-accel-ops-icount.c',
diff --git a/dump/meson.build b/dump/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/dump/meson.build
+++ b/dump/meson.build
@@ -XXX,XX +XXX,XX @@
 softmmu_ss.add([files('dump.c', 'dump-hmp-cmds.c'), snappy, lzo])
-specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('win_dump.c'))
+specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: files('win_dump.c'))
diff --git a/hw/i386/kvm/meson.build b/hw/i386/kvm/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/i386/kvm/meson.build
+++ b/hw/i386/kvm/meson.build
@@ -XXX,XX +XXX,XX @@ xen_stubs_ss.add(when: 'CONFIG_XEN_EMU', if_false: files(
   'xen-stubs.c',
 ))
 
-specific_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: xen_stubs_ss)
+specific_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: xen_stubs_ss)
diff --git a/migration/meson.build b/migration/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/migration/meson.build
+++ b/migration/meson.build
@@ -XXX,XX +XXX,XX @@ if get_option('live_block_migration').allowed()
 endif
 softmmu_ss.add(when: zstd, if_true: files('multifd-zstd.c'))
 
-specific_ss.add(when: 'CONFIG_SOFTMMU',
+specific_ss.add(when: 'CONFIG_SYSTEM_ONLY',
                 if_true: files('ram.c',
                                'target.c'))
diff --git a/monitor/meson.build b/monitor/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/monitor/meson.build
+++ b/monitor/meson.build
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(files(
 ))
 softmmu_ss.add([spice_headers, files('qmp-cmds.c')])
 
-specific_ss.add(when: 'CONFIG_SOFTMMU',
+specific_ss.add(when: 'CONFIG_SYSTEM_ONLY',
 		if_true: [files( 'hmp-cmds-target.c', 'hmp-target.c'), spice])
diff --git a/qapi/meson.build b/qapi/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -XXX,XX +XXX,XX @@ foreach output : qapi_specific_outputs + qapi_nonmodule_outputs
   if output.endswith('.trace-events')
     qapi_trace_events += qapi_files[i]
   endif
-  specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: qapi_files[i])
+  specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: qapi_files[i])
   i = i + 1
 endforeach
diff --git a/semihosting/meson.build b/semihosting/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/semihosting/meson.build
+++ b/semihosting/meson.build
@@ -XXX,XX +XXX,XX @@ specific_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files(
   'syscalls.c',
 ))
 
-specific_ss.add(when: ['CONFIG_SEMIHOSTING', 'CONFIG_SOFTMMU'], if_true: files(
+specific_ss.add(when: ['CONFIG_SEMIHOSTING', 'CONFIG_SYSTEM_ONLY'], if_true: files(
   'config.c',
   'console.c',
   'uaccess.c',
diff --git a/softmmu/meson.build b/softmmu/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/softmmu/meson.build
+++ b/softmmu/meson.build
@@ -XXX,XX +XXX,XX @@
-specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files(
+specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files(
   'arch_init.c',
   'ioport.c',
   'memory.c',
@@ -XXX,XX +XXX,XX @@ specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files(
   'watchpoint.c',
 )])
 
-specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: [files(
+specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: [files(
   'icount.c',
 )])
 
diff --git a/target/i386/tcg/sysemu/meson.build b/target/i386/tcg/sysemu/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/i386/tcg/sysemu/meson.build
+++ b/target/i386/tcg/sysemu/meson.build
@@ -XXX,XX +XXX,XX @@
-i386_softmmu_ss.add(when: ['CONFIG_TCG', 'CONFIG_SOFTMMU'], if_true: files(
+i386_softmmu_ss.add(when: ['CONFIG_TCG', 'CONFIG_SYSTEM_ONLY'], if_true: files(
   'tcg-cpu.c',
   'smm_helper.c',
   'excp_helper.c',
diff --git a/ui/meson.build b/ui/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -XXX,XX +XXX,XX @@
 softmmu_ss.add(pixman)
-specific_ss.add(when: ['CONFIG_SOFTMMU'], if_true: pixman)   # for the include path
-specific_ss.add(when: ['CONFIG_SOFTMMU'], if_true: opengl)   # for the include path
+specific_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: pixman)   # for the include path
+specific_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: opengl)   # for the include path
 
 softmmu_ss.add(png)
 softmmu_ss.add(files(
-- 
2.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

We use the user_ss[] array to hold the user emulation sources,
and the softmmu_ss[] array to hold the system emulation ones.
Hold the latter in the 'system_ss[]' array for parity with user
emulation.

Mechanical change doing:

$ sed -i -e s/softmmu_ss/system_ss/g $(git grep -l softmmu_ss)

diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst
index XXXXXXX..XXXXXXX 100644
--- a/docs/devel/build-system.rst
+++ b/docs/devel/build-system.rst
@@ -XXX,XX +XXX,XX @@ Target-independent emulator sourcesets:
   This includes error handling infrastructure, standard data structures,
   platform portability wrapper functions, etc.
 
-  Target-independent code lives in the ``common_ss``, ``softmmu_ss`` and
+  Target-independent code lives in the ``common_ss``, ``system_ss`` and
   ``user_ss`` sourcesets.  ``common_ss`` is linked into all emulators,
-  ``softmmu_ss`` only in system emulators, ``user_ss`` only in user-mode
+  ``system_ss`` only in system emulators, ``user_ss`` only in user-mode
   emulators.
 
   Target-independent sourcesets must exercise particular care when using
@@ -XXX,XX +XXX,XX @@ Target-independent emulator sourcesets:
   symbol::
 
     # Some targets have CONFIG_ACPI, some don't, so this is not enough
-    softmmu_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi.c'),
+    system_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi.c'),
                                         if_false: files('acpi-stub.c'))
 
     # This is required as well:
-    softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c'))
+    system_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c'))
 
 Target-dependent emulator sourcesets:
   In the target-dependent set lives CPU emulation, some device emulation and
@@ -XXX,XX +XXX,XX @@ Target-dependent emulator sourcesets:
   for all emulators and for system emulators only.  For example::
 
     arm_ss = ss.source_set()
-    arm_softmmu_ss = ss.source_set()
+    arm_system_ss = ss.source_set()
     ...
     target_arch += {'arm': arm_ss}
-    target_softmmu_arch += {'arm': arm_softmmu_ss}
+    target_softmmu_arch += {'arm': arm_system_ss}
 
 Module sourcesets:
   There are two dictionaries for modules: ``modules`` is used for
   target-independent modules and ``target_modules`` is used for
   target-dependent modules.  When modules are disabled the ``module``
-  source sets are added to ``softmmu_ss`` and the ``target_modules``
+  source sets are added to ``system_ss`` and the ``target_modules``
   source sets are added to ``specific_ss``.
 
   Both dictionaries are nested.  One dictionary is created per
diff --git a/meson.build b/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/meson.build
+++ b/meson.build
@@ -XXX,XX +XXX,XX @@ hwcore_ss = ss.source_set()
 io_ss = ss.source_set()
 qmp_ss = ss.source_set()
 qom_ss = ss.source_set()
-softmmu_ss = ss.source_set()
+system_ss = ss.source_set()
 specific_fuzz_ss = ss.source_set()
 specific_ss = ss.source_set()
 stub_ss = ss.source_set()
@@ -XXX,XX +XXX,XX @@ if have_block
   # os-posix.c contains POSIX-specific functions used by qemu-storage-daemon,
   # os-win32.c does not
   blockdev_ss.add(when: 'CONFIG_POSIX', if_true: files('os-posix.c'))
-  softmmu_ss.add(when: 'CONFIG_WIN32', if_true: [files('os-win32.c')])
+  system_ss.add(when: 'CONFIG_WIN32', if_true: [files('os-win32.c')])
 endif
 
 common_ss.add(files('cpus-common.c'))
@@ -XXX,XX +XXX,XX @@ foreach d, list : modules
       if d == 'block'
         block_ss.add_all(module_ss)
       else
-        softmmu_ss.add_all(module_ss)
+        system_ss.add_all(module_ss)
       endif
     endif
   endforeach
@@ -XXX,XX +XXX,XX @@ libmigration = static_library('migration', sources: migration_files + genh,
                               build_by_default: false)
 migration = declare_dependency(link_with: libmigration,
                                dependencies: [zlib, qom, io])
-softmmu_ss.add(migration)
+system_ss.add(migration)
 
 block_ss = block_ss.apply(config_host, strict: false)
 libblock = static_library('block', block_ss.sources() + genh,
@@ -XXX,XX +XXX,XX @@ if emulator_modules.length() > 0
   alias_target('modules', emulator_modules)
 endif
 
-softmmu_ss.add(authz, blockdev, chardev, crypto, io, qmp)
+system_ss.add(authz, blockdev, chardev, crypto, io, qmp)
 common_ss.add(qom, qemuutil)
 
-common_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: [softmmu_ss])
+common_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: [system_ss])
 common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss)
 
 common_all = common_ss.apply(config_all, strict: false)
diff --git a/accel/meson.build b/accel/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/accel/meson.build
+++ b/accel/meson.build
@@ -XXX,XX +XXX,XX @@
 specific_ss.add(files('accel-common.c', 'accel-blocker.c'))
-softmmu_ss.add(files('accel-softmmu.c'))
+system_ss.add(files('accel-softmmu.c'))
 user_ss.add(files('accel-user.c'))
 
 subdir('tcg')
@@ -XXX,XX +XXX,XX @@ if have_system
 endif
 
 # qtest
-softmmu_ss.add(files('dummy-cpus.c'))
+system_ss.add(files('dummy-cpus.c'))
diff --git a/audio/meson.build b/audio/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/audio/meson.build
+++ b/audio/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add([spice_headers, files('audio.c')])
-softmmu_ss.add(files(
+system_ss.add([spice_headers, files('audio.c')])
+system_ss.add(files(
   'audio-hmp-cmds.c',
   'audio_legacy.c',
   'mixeng.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(files(
   'wavcapture.c',
 ))
 
-softmmu_ss.add(when: coreaudio, if_true: files('coreaudio.m'))
-softmmu_ss.add(when: dsound, if_true: files('dsoundaudio.c', 'audio_win_int.c'))
+system_ss.add(when: coreaudio, if_true: files('coreaudio.m'))
+system_ss.add(when: dsound, if_true: files('dsoundaudio.c', 'audio_win_int.c'))
 
 audio_modules = {}
 foreach m : [
diff --git a/backends/meson.build b/backends/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/backends/meson.build
+++ b/backends/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add([files(
+system_ss.add([files(
   'cryptodev-builtin.c',
   'cryptodev-hmp-cmds.c',
   'cryptodev.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add([files(
   'confidential-guest-support.c',
 ), numa])
 
-softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files('rng-random.c'))
-softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files('hostmem-file.c'))
-softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('hostmem-memfd.c'))
+system_ss.add(when: 'CONFIG_POSIX', if_true: files('rng-random.c'))
+system_ss.add(when: 'CONFIG_POSIX', if_true: files('hostmem-file.c'))
+system_ss.add(when: 'CONFIG_LINUX', if_true: files('hostmem-memfd.c'))
 if keyutils.found()
-    softmmu_ss.add(keyutils, files('cryptodev-lkcf.c'))
+    system_ss.add(keyutils, files('cryptodev-lkcf.c'))
 endif
 if have_vhost_user
-  softmmu_ss.add(when: 'CONFIG_VIRTIO', if_true: files('vhost-user.c'))
+  system_ss.add(when: 'CONFIG_VIRTIO', if_true: files('vhost-user.c'))
 endif
-softmmu_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('cryptodev-vhost.c'))
+system_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('cryptodev-vhost.c'))
 if have_vhost_user_crypto
-  softmmu_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('cryptodev-vhost-user.c'))
+  system_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('cryptodev-vhost-user.c'))
 endif
-softmmu_ss.add(when: gio, if_true: files('dbus-vmstate.c'))
-softmmu_ss.add(when: 'CONFIG_SGX', if_true: files('hostmem-epc.c'))
+system_ss.add(when: gio, if_true: files('dbus-vmstate.c'))
+system_ss.add(when: 'CONFIG_SGX', if_true: files('hostmem-epc.c'))
 
 subdir('tpm')
diff --git a/backends/tpm/meson.build b/backends/tpm/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/backends/tpm/meson.build
+++ b/backends/tpm/meson.build
@@ -XXX,XX +XXX,XX @@
 if have_tpm
-  softmmu_ss.add(files('tpm_backend.c'))
-  softmmu_ss.add(files('tpm_util.c'))
-  softmmu_ss.add(when: 'CONFIG_TPM_PASSTHROUGH', if_true: files('tpm_passthrough.c'))
-  softmmu_ss.add(when: 'CONFIG_TPM_EMULATOR', if_true: files('tpm_emulator.c'))
+  system_ss.add(files('tpm_backend.c'))
+  system_ss.add(files('tpm_util.c'))
+  system_ss.add(when: 'CONFIG_TPM_PASSTHROUGH', if_true: files('tpm_passthrough.c'))
+  system_ss.add(when: 'CONFIG_TPM_EMULATOR', if_true: files('tpm_emulator.c'))
 endif
diff --git a/block/meson.build b/block/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/block/meson.build
+++ b/block/meson.build
@@ -XXX,XX +XXX,XX @@ block_ss.add(files(
   'write-threshold.c',
 ), zstd, zlib, gnutls)
 
-softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
-softmmu_ss.add(files('block-ram-registrar.c'))
+system_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
+system_ss.add(files('block-ram-registrar.c'))
 
 if get_option('qcow1').allowed()
   block_ss.add(files('qcow.c'))
@@ -XXX,XX +XXX,XX @@ block_ss.add(block_gen_c)
 
 block_ss.add(files('stream.c'))
 
-softmmu_ss.add(files('qapi-sysemu.c'))
+system_ss.add(files('qapi-sysemu.c'))
 
 subdir('export')
 subdir('monitor')
diff --git a/block/monitor/meson.build b/block/monitor/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/block/monitor/meson.build
+++ b/block/monitor/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(files('block-hmp-cmds.c'))
+system_ss.add(files('block-hmp-cmds.c'))
 block_ss.add(files('bitmap-qmp-cmds.c'))
diff --git a/chardev/meson.build b/chardev/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/chardev/meson.build
+++ b/chardev/meson.build
@@ -XXX,XX +XXX,XX @@ chardev_ss.add(when: 'CONFIG_WIN32', if_true: files(
 
 chardev_ss = chardev_ss.apply(config_host, strict: false)
 
-softmmu_ss.add(files(
+system_ss.add(files(
     'char-hmp-cmds.c',
     'msmouse.c',
     'wctablet.c',
diff --git a/disas/meson.build b/disas/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/disas/meson.build
+++ b/disas/meson.build
@@ -XXX,XX +XXX,XX @@ common_ss.add(when: 'CONFIG_XTENSA_DIS', if_true: files('xtensa.c'))
 common_ss.add(when: capstone, if_true: [files('capstone.c'), capstone])
 common_ss.add(files('disas.c'))
 
-softmmu_ss.add(files('disas-mon.c'))
+system_ss.add(files('disas-mon.c'))
 specific_ss.add(capstone)
diff --git a/dump/meson.build b/dump/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/dump/meson.build
+++ b/dump/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add([files('dump.c', 'dump-hmp-cmds.c'), snappy, lzo])
+system_ss.add([files('dump.c', 'dump-hmp-cmds.c'), snappy, lzo])
 specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: files('win_dump.c'))
diff --git a/ebpf/meson.build b/ebpf/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/ebpf/meson.build
+++ b/ebpf/meson.build
@@ -1 +1 @@
-softmmu_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c'))
+system_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c'))
diff --git a/fsdev/meson.build b/fsdev/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/fsdev/meson.build
+++ b/fsdev/meson.build
@@ -XXX,XX +XXX,XX @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files(
   '9p-marshal.c',
   'qemu-fsdev.c',
 ), if_false: files('qemu-fsdev-dummy.c'))
-softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss)
-softmmu_ss.add_all(when: 'CONFIG_DARWIN', if_true: fsdev_ss)
+system_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss)
+system_ss.add_all(when: 'CONFIG_DARWIN', if_true: fsdev_ss)
 
 if have_virtfs_proxy_helper
   executable('virtfs-proxy-helper',
diff --git a/gdbstub/meson.build b/gdbstub/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/gdbstub/meson.build
+++ b/gdbstub/meson.build
@@ -XXX,XX +XXX,XX @@
 # cflags so:
 
 gdb_user_ss = ss.source_set()
-gdb_softmmu_ss = ss.source_set()
+gdb_system_ss = ss.source_set()
 
 # We build two versions of gdbstub, one for each mode
 gdb_user_ss.add(files('gdbstub.c', 'user.c'))
-gdb_softmmu_ss.add(files('gdbstub.c', 'softmmu.c'))
+gdb_system_ss.add(files('gdbstub.c', 'softmmu.c'))
 
 gdb_user_ss = gdb_user_ss.apply(config_host, strict: false)
-gdb_softmmu_ss = gdb_softmmu_ss.apply(config_host, strict: false)
+gdb_system_ss = gdb_system_ss.apply(config_host, strict: false)
 
 libgdb_user = static_library('gdb_user',
                              gdb_user_ss.sources() + genh,
@@ -XXX,XX +XXX,XX @@ libgdb_user = static_library('gdb_user',
                              build_by_default: have_user)
 
 libgdb_softmmu = static_library('gdb_softmmu',
-                                gdb_softmmu_ss.sources() + genh,
+                                gdb_system_ss.sources() + genh,
                                 name_suffix: 'fa',
                                 build_by_default: have_system)
 
 gdb_user = declare_dependency(link_whole: libgdb_user)
 user_ss.add(gdb_user)
 gdb_softmmu = declare_dependency(link_whole: libgdb_softmmu)
-softmmu_ss.add(gdb_softmmu)
+system_ss.add(gdb_softmmu)
 
 common_ss.add(files('syscalls.c'))
 
diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/9pfs/meson.build
+++ b/hw/9pfs/meson.build
@@ -XXX,XX +XXX,XX @@ fs_ss.add(files(
 fs_ss.add(when: 'CONFIG_LINUX', if_true: files('9p-util-linux.c'))
 fs_ss.add(when: 'CONFIG_DARWIN', if_true: files('9p-util-darwin.c'))
 fs_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen-9p-backend.c'))
-softmmu_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss)
+system_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss)
 
 specific_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-device.c'))
diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/acpi/meson.build
+++ b/hw/acpi/meson.build
@@ -XXX,XX +XXX,XX @@ acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c'))
 if have_tpm
   acpi_ss.add(files('tpm.c'))
 endif
-softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c', 'acpi_interface.c'))
-softmmu_ss.add(when: 'CONFIG_ACPI_PCI_BRIDGE', if_false: files('pci-bridge-stub.c'))
-softmmu_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss)
-softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c', 'aml-build-stub.c',
+system_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c', 'acpi_interface.c'))
+system_ss.add(when: 'CONFIG_ACPI_PCI_BRIDGE', if_false: files('pci-bridge-stub.c'))
+system_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss)
+system_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c', 'aml-build-stub.c',
                                                   'acpi-x86-stub.c', 'ipmi-stub.c', 'ghes-stub.c',
                                                   'acpi-mem-hotplug-stub.c', 'acpi-cpu-hotplug-stub.c',
                                                   'acpi-pci-hotplug-stub.c', 'acpi-nvdimm-stub.c',
                                                   'cxl-stub.c', 'pci-bridge-stub.c'))
-softmmu_ss.add(files('acpi-qmp-cmds.c'))
+system_ss.add(files('acpi-qmp-cmds.c'))
diff --git a/hw/adc/meson.build b/hw/adc/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/adc/meson.build
+++ b/hw/adc/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_STM32F2XX_ADC', if_true: files('stm32f2xx_adc.c'))
-softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_adc.c'))
-softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_adc.c'))
-softmmu_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq-xadc.c'))
-softmmu_ss.add(when: 'CONFIG_MAX111X', if_true: files('max111x.c'))
+system_ss.add(when: 'CONFIG_STM32F2XX_ADC', if_true: files('stm32f2xx_adc.c'))
+system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_adc.c'))
+system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_adc.c'))
+system_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq-xadc.c'))
+system_ss.add(when: 'CONFIG_MAX111X', if_true: files('max111x.c'))
diff --git a/hw/arm/meson.build b/hw/arm/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/arm/meson.build
+++ b/hw/arm/meson.build
@@ -XXX,XX +XXX,XX @@ arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c'))
 arm_ss.add(when: 'CONFIG_XEN', if_true: files('xen_arm.c'))
 arm_ss.add_all(xen_ss)
 
-softmmu_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c'))
-softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c'))
-softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c'))
-softmmu_ss.add(when: 'CONFIG_TOSA', if_true: files('tosa.c'))
+system_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c'))
+system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c'))
+system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c'))
+system_ss.add(when: 'CONFIG_TOSA', if_true: files('tosa.c'))
 
 hw_arch += {'arm': arm_ss}
diff --git a/hw/audio/meson.build b/hw/audio/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/audio/meson.build
+++ b/hw/audio/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(files('soundhw.c'))
-softmmu_ss.add(when: 'CONFIG_AC97', if_true: files('ac97.c'))
-softmmu_ss.add(when: 'CONFIG_ADLIB', if_true: files('fmopl.c', 'adlib.c'))
-softmmu_ss.add(when: 'CONFIG_CS4231', if_true: files('cs4231.c'))
-softmmu_ss.add(when: 'CONFIG_CS4231A', if_true: files('cs4231a.c'))
-softmmu_ss.add(when: 'CONFIG_ES1370', if_true: files('es1370.c'))
-softmmu_ss.add(when: 'CONFIG_GUS', if_true: files('gus.c', 'gusemu_hal.c', 'gusemu_mixer.c'))
-softmmu_ss.add(when: 'CONFIG_HDA', if_true: files('intel-hda.c', 'hda-codec.c'))
-softmmu_ss.add(when: 'CONFIG_MARVELL_88W8618', if_true: files('marvell_88w8618.c'))
-softmmu_ss.add(when: 'CONFIG_PCSPK', if_true: files('pcspk.c'))
-softmmu_ss.add(when: 'CONFIG_PL041', if_true: files('pl041.c', 'lm4549.c'))
-softmmu_ss.add(when: 'CONFIG_SB16', if_true: files('sb16.c'))
-softmmu_ss.add(when: 'CONFIG_VT82C686', if_true: files('via-ac97.c'))
-softmmu_ss.add(when: 'CONFIG_WM8750', if_true: files('wm8750.c'))
+system_ss.add(files('soundhw.c'))
+system_ss.add(when: 'CONFIG_AC97', if_true: files('ac97.c'))
+system_ss.add(when: 'CONFIG_ADLIB', if_true: files('fmopl.c', 'adlib.c'))
+system_ss.add(when: 'CONFIG_CS4231', if_true: files('cs4231.c'))
+system_ss.add(when: 'CONFIG_CS4231A', if_true: files('cs4231a.c'))
+system_ss.add(when: 'CONFIG_ES1370', if_true: files('es1370.c'))
+system_ss.add(when: 'CONFIG_GUS', if_true: files('gus.c', 'gusemu_hal.c', 'gusemu_mixer.c'))
+system_ss.add(when: 'CONFIG_HDA', if_true: files('intel-hda.c', 'hda-codec.c'))
+system_ss.add(when: 'CONFIG_MARVELL_88W8618', if_true: files('marvell_88w8618.c'))
+system_ss.add(when: 'CONFIG_PCSPK', if_true: files('pcspk.c'))
+system_ss.add(when: 'CONFIG_PL041', if_true: files('pl041.c', 'lm4549.c'))
+system_ss.add(when: 'CONFIG_SB16', if_true: files('sb16.c'))
+system_ss.add(when: 'CONFIG_VT82C686', if_true: files('via-ac97.c'))
+system_ss.add(when: 'CONFIG_WM8750', if_true: files('wm8750.c'))
diff --git a/hw/block/meson.build b/hw/block/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/meson.build
+++ b/hw/block/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(files(
+system_ss.add(files(
   'block.c',
   'cdrom.c',
   'hd-geometry.c'
 ))
-softmmu_ss.add(when: 'CONFIG_ECC', if_true: files('ecc.c'))
-softmmu_ss.add(when: 'CONFIG_FDC', if_true: files('fdc.c'))
-softmmu_ss.add(when: 'CONFIG_FDC_ISA', if_true: files('fdc-isa.c'))
-softmmu_ss.add(when: 'CONFIG_FDC_SYSBUS', if_true: files('fdc-sysbus.c'))
-softmmu_ss.add(when: 'CONFIG_NAND', if_true: files('nand.c'))
-softmmu_ss.add(when: 'CONFIG_ONENAND', if_true: files('onenand.c'))
-softmmu_ss.add(when: 'CONFIG_PFLASH_CFI01', if_true: files('pflash_cfi01.c'))
-softmmu_ss.add(when: 'CONFIG_PFLASH_CFI02', if_true: files('pflash_cfi02.c'))
-softmmu_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('m25p80.c'))
-softmmu_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('m25p80_sfdp.c'))
-softmmu_ss.add(when: 'CONFIG_SWIM', if_true: files('swim.c'))
-softmmu_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen-block.c'))
-softmmu_ss.add(when: 'CONFIG_TC58128', if_true: files('tc58128.c'))
+system_ss.add(when: 'CONFIG_ECC', if_true: files('ecc.c'))
+system_ss.add(when: 'CONFIG_FDC', if_true: files('fdc.c'))
+system_ss.add(when: 'CONFIG_FDC_ISA', if_true: files('fdc-isa.c'))
+system_ss.add(when: 'CONFIG_FDC_SYSBUS', if_true: files('fdc-sysbus.c'))
+system_ss.add(when: 'CONFIG_NAND', if_true: files('nand.c'))
+system_ss.add(when: 'CONFIG_ONENAND', if_true: files('onenand.c'))
+system_ss.add(when: 'CONFIG_PFLASH_CFI01', if_true: files('pflash_cfi01.c'))
+system_ss.add(when: 'CONFIG_PFLASH_CFI02', if_true: files('pflash_cfi02.c'))
+system_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('m25p80.c'))
+system_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('m25p80_sfdp.c'))
+system_ss.add(when: 'CONFIG_SWIM', if_true: files('swim.c'))
+system_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen-block.c'))
+system_ss.add(when: 'CONFIG_TC58128', if_true: files('tc58128.c'))
 
 specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c', 'virtio-blk-common.c'))
 specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk.c', 'virtio-blk-common.c'))
diff --git a/hw/char/meson.build b/hw/char/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/char/meson.build
+++ b/hw/char/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_uart.c'))
-softmmu_ss.add(when: 'CONFIG_CMSDK_APB_UART', if_true: files('cmsdk-apb-uart.c'))
-softmmu_ss.add(when: 'CONFIG_ESCC', if_true: files('escc.c'))
-softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_ser.c'))
-softmmu_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_apbuart.c'))
-softmmu_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_uart.c'))
-softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_serial.c'))
-softmmu_ss.add(when: 'CONFIG_IPACK', if_true: files('ipoctal232.c'))
-softmmu_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('parallel-isa.c'))
-softmmu_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugcon.c'))
-softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_uart.c'))
-softmmu_ss.add(when: 'CONFIG_PARALLEL', if_true: files('parallel.c'))
-softmmu_ss.add(when: 'CONFIG_PL011', if_true: files('pl011.c'))
-softmmu_ss.add(when: 'CONFIG_SCLPCONSOLE', if_true: files('sclpconsole.c', 'sclpconsole-lm.c'))
-softmmu_ss.add(when: 'CONFIG_SERIAL', if_true: files('serial.c'))
-softmmu_ss.add(when: 'CONFIG_SERIAL_ISA', if_true: files('serial-isa.c'))
-softmmu_ss.add(when: 'CONFIG_SERIAL_PCI', if_true: files('serial-pci.c'))
-softmmu_ss.add(when: 'CONFIG_SERIAL_PCI_MULTI', if_true: files('serial-pci-multi.c'))
-softmmu_ss.add(when: 'CONFIG_SHAKTI_UART', if_true: files('shakti_uart.c'))
-softmmu_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-console.c'))
-softmmu_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen_console.c'))
-softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_uartlite.c'))
+system_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_uart.c'))
+system_ss.add(when: 'CONFIG_CMSDK_APB_UART', if_true: files('cmsdk-apb-uart.c'))
+system_ss.add(when: 'CONFIG_ESCC', if_true: files('escc.c'))
+system_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_ser.c'))
+system_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_apbuart.c'))
+system_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_uart.c'))
+system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_serial.c'))
+system_ss.add(when: 'CONFIG_IPACK', if_true: files('ipoctal232.c'))
+system_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('parallel-isa.c'))
+system_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugcon.c'))
+system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_uart.c'))
+system_ss.add(when: 'CONFIG_PARALLEL', if_true: files('parallel.c'))
+system_ss.add(when: 'CONFIG_PL011', if_true: files('pl011.c'))
+system_ss.add(when: 'CONFIG_SCLPCONSOLE', if_true: files('sclpconsole.c', 'sclpconsole-lm.c'))
+system_ss.add(when: 'CONFIG_SERIAL', if_true: files('serial.c'))
+system_ss.add(when: 'CONFIG_SERIAL_ISA', if_true: files('serial-isa.c'))
+system_ss.add(when: 'CONFIG_SERIAL_PCI', if_true: files('serial-pci.c'))
+system_ss.add(when: 'CONFIG_SERIAL_PCI_MULTI', if_true: files('serial-pci-multi.c'))
+system_ss.add(when: 'CONFIG_SHAKTI_UART', if_true: files('shakti_uart.c'))
+system_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-console.c'))
+system_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen_console.c'))
+system_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_uartlite.c'))
 
-softmmu_ss.add(when: 'CONFIG_AVR_USART', if_true: files('avr_usart.c'))
-softmmu_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_uart.c'))
-softmmu_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic-uart.c'))
-softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_uart.c'))
-softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_uart.c'))
-softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_aux.c'))
-softmmu_ss.add(when: 'CONFIG_RENESAS_SCI', if_true: files('renesas_sci.c'))
-softmmu_ss.add(when: 'CONFIG_SIFIVE_UART', if_true: files('sifive_uart.c'))
-softmmu_ss.add(when: 'CONFIG_SH_SCI', if_true: files('sh_serial.c'))
-softmmu_ss.add(when: 'CONFIG_STM32F2XX_USART', if_true: files('stm32f2xx_usart.c'))
-softmmu_ss.add(when: 'CONFIG_MCHP_PFSOC_MMUART', if_true: files('mchp_pfsoc_mmuart.c'))
-softmmu_ss.add(when: 'CONFIG_HTIF', if_true: files('riscv_htif.c'))
-softmmu_ss.add(when: 'CONFIG_GOLDFISH_TTY', if_true: files('goldfish_tty.c'))
+system_ss.add(when: 'CONFIG_AVR_USART', if_true: files('avr_usart.c'))
+system_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_uart.c'))
+system_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic-uart.c'))
+system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_uart.c'))
+system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_uart.c'))
+system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_aux.c'))
+system_ss.add(when: 'CONFIG_RENESAS_SCI', if_true: files('renesas_sci.c'))
+system_ss.add(when: 'CONFIG_SIFIVE_UART', if_true: files('sifive_uart.c'))
+system_ss.add(when: 'CONFIG_SH_SCI', if_true: files('sh_serial.c'))
+system_ss.add(when: 'CONFIG_STM32F2XX_USART', if_true: files('stm32f2xx_usart.c'))
+system_ss.add(when: 'CONFIG_MCHP_PFSOC_MMUART', if_true: files('mchp_pfsoc_mmuart.c'))
+system_ss.add(when: 'CONFIG_HTIF', if_true: files('riscv_htif.c'))
+system_ss.add(when: 'CONFIG_GOLDFISH_TTY', if_true: files('goldfish_tty.c'))
 
 specific_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('terminal3270.c'))
 specific_ss.add(when: 'CONFIG_VIRTIO', if_true: files('virtio-serial-bus.c'))
diff --git a/hw/core/meson.build b/hw/core/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/core/meson.build
+++ b/hw/core/meson.build
@@ -XXX,XX +XXX,XX @@ endif
 
 common_ss.add(files('cpu-common.c'))
 common_ss.add(files('machine-smp.c'))
-softmmu_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c'))
-softmmu_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c'))
-softmmu_ss.add(when: ['CONFIG_GUEST_LOADER', fdt], if_true: files('guest-loader.c'))
-softmmu_ss.add(when: 'CONFIG_OR_IRQ', if_true: files('or-irq.c'))
-softmmu_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('platform-bus.c'))
-softmmu_ss.add(when: 'CONFIG_PTIMER', if_true: files('ptimer.c'))
-softmmu_ss.add(when: 'CONFIG_REGISTER', if_true: files('register.c'))
-softmmu_ss.add(when: 'CONFIG_SPLIT_IRQ', if_true: files('split-irq.c'))
-softmmu_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c'))
-softmmu_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('sysbus-fdt.c'))
+system_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c'))
+system_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c'))
+system_ss.add(when: ['CONFIG_GUEST_LOADER', fdt], if_true: files('guest-loader.c'))
+system_ss.add(when: 'CONFIG_OR_IRQ', if_true: files('or-irq.c'))
+system_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('platform-bus.c'))
+system_ss.add(when: 'CONFIG_PTIMER', if_true: files('ptimer.c'))
+system_ss.add(when: 'CONFIG_REGISTER', if_true: files('register.c'))
+system_ss.add(when: 'CONFIG_SPLIT_IRQ', if_true: files('split-irq.c'))
+system_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c'))
+system_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('sysbus-fdt.c'))
 
-softmmu_ss.add(files(
+system_ss.add(files(
   'cpu-sysemu.c',
   'fw-path-provider.c',
   'gpio.c',
diff --git a/hw/cpu/meson.build b/hw/cpu/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/cpu/meson.build
+++ b/hw/cpu/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(files('core.c', 'cluster.c'))
+system_ss.add(files('core.c', 'cluster.c'))
 
-softmmu_ss.add(when: 'CONFIG_ARM11MPCORE', if_true: files('arm11mpcore.c'))
-softmmu_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_mpcore.c'))
+system_ss.add(when: 'CONFIG_ARM11MPCORE', if_true: files('arm11mpcore.c'))
+system_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_mpcore.c'))
 specific_ss.add(when: 'CONFIG_A9MPCORE', if_true: files('a9mpcore.c'))
 specific_ss.add(when: 'CONFIG_A15MPCORE', if_true: files('a15mpcore.c'))
diff --git a/hw/cxl/meson.build b/hw/cxl/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/cxl/meson.build
+++ b/hw/cxl/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_CXL',
+system_ss.add(when: 'CONFIG_CXL',
                if_true: files(
                    'cxl-component-utils.c',
                    'cxl-device-utils.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(when: 'CONFIG_CXL',
                    'cxl-host-stubs.c',
                ))
 
-softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('cxl-host-stubs.c'))
+system_ss.add(when: 'CONFIG_ALL', if_true: files('cxl-host-stubs.c'))
diff --git a/hw/display/meson.build b/hw/display/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -XXX,XX +XXX,XX @@
 hw_display_modules = {}
 
-softmmu_ss.add(when: 'CONFIG_DDC', if_true: files('i2c-ddc.c'))
-softmmu_ss.add(when: 'CONFIG_EDID', if_true: files('edid-generate.c', 'edid-region.c'))
+system_ss.add(when: 'CONFIG_DDC', if_true: files('i2c-ddc.c'))
+system_ss.add(when: 'CONFIG_EDID', if_true: files('edid-generate.c', 'edid-region.c'))
 
-softmmu_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb.c'))
-softmmu_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb-standalone.c'))
+system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb.c'))
+system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb-standalone.c'))
 
-softmmu_ss.add(when: 'CONFIG_VGA_CIRRUS', if_true: files('cirrus_vga.c'))
-softmmu_ss.add(when: ['CONFIG_VGA_CIRRUS', 'CONFIG_VGA_ISA'], if_true: files('cirrus_vga_isa.c'))
-softmmu_ss.add(when: 'CONFIG_G364FB', if_true: files('g364fb.c'))
-softmmu_ss.add(when: 'CONFIG_JAZZ_LED', if_true: files('jazz_led.c'))
-softmmu_ss.add(when: 'CONFIG_PL110', if_true: files('pl110.c'))
-softmmu_ss.add(when: 'CONFIG_SII9022', if_true: files('sii9022.c'))
-softmmu_ss.add(when: 'CONFIG_SSD0303', if_true: files('ssd0303.c'))
-softmmu_ss.add(when: 'CONFIG_SSD0323', if_true: files('ssd0323.c'))
-softmmu_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xenfb.c'))
+system_ss.add(when: 'CONFIG_VGA_CIRRUS', if_true: files('cirrus_vga.c'))
+system_ss.add(when: ['CONFIG_VGA_CIRRUS', 'CONFIG_VGA_ISA'], if_true: files('cirrus_vga_isa.c'))
+system_ss.add(when: 'CONFIG_G364FB', if_true: files('g364fb.c'))
+system_ss.add(when: 'CONFIG_JAZZ_LED', if_true: files('jazz_led.c'))
+system_ss.add(when: 'CONFIG_PL110', if_true: files('pl110.c'))
+system_ss.add(when: 'CONFIG_SII9022', if_true: files('sii9022.c'))
+system_ss.add(when: 'CONFIG_SSD0303', if_true: files('ssd0303.c'))
+system_ss.add(when: 'CONFIG_SSD0323', if_true: files('ssd0323.c'))
+system_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xenfb.c'))
 
-softmmu_ss.add(when: 'CONFIG_VGA_PCI', if_true: files('vga-pci.c'))
-softmmu_ss.add(when: 'CONFIG_VGA_ISA', if_true: files('vga-isa.c'))
-softmmu_ss.add(when: 'CONFIG_VGA_MMIO', if_true: files('vga-mmio.c'))
-softmmu_ss.add(when: 'CONFIG_VMWARE_VGA', if_true: files('vmware_vga.c'))
-softmmu_ss.add(when: 'CONFIG_BOCHS_DISPLAY', if_true: files('bochs-display.c'))
+system_ss.add(when: 'CONFIG_VGA_PCI', if_true: files('vga-pci.c'))
+system_ss.add(when: 'CONFIG_VGA_ISA', if_true: files('vga-isa.c'))
+system_ss.add(when: 'CONFIG_VGA_MMIO', if_true: files('vga-mmio.c'))
+system_ss.add(when: 'CONFIG_VMWARE_VGA', if_true: files('vmware_vga.c'))
+system_ss.add(when: 'CONFIG_BOCHS_DISPLAY', if_true: files('bochs-display.c'))
 
-softmmu_ss.add(when: 'CONFIG_BLIZZARD', if_true: files('blizzard.c'))
-softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_fimd.c'))
-softmmu_ss.add(when: 'CONFIG_FRAMEBUFFER', if_true: files('framebuffer.c'))
-softmmu_ss.add(when: 'CONFIG_ZAURUS', if_true: files('tc6393xb.c'))
+system_ss.add(when: 'CONFIG_BLIZZARD', if_true: files('blizzard.c'))
+system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_fimd.c'))
+system_ss.add(when: 'CONFIG_FRAMEBUFFER', if_true: files('framebuffer.c'))
+system_ss.add(when: 'CONFIG_ZAURUS', if_true: files('tc6393xb.c'))
 
-softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dss.c'))
-softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_lcd.c'))
-softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_fb.c'))
-softmmu_ss.add(when: 'CONFIG_SM501', if_true: files('sm501.c'))
-softmmu_ss.add(when: 'CONFIG_TCX', if_true: files('tcx.c'))
-softmmu_ss.add(when: 'CONFIG_CG3', if_true: files('cg3.c'))
-softmmu_ss.add(when: 'CONFIG_MACFB', if_true: files('macfb.c'))
-softmmu_ss.add(when: 'CONFIG_NEXTCUBE', if_true: files('next-fb.c'))
+system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dss.c'))
+system_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_lcd.c'))
+system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_fb.c'))
+system_ss.add(when: 'CONFIG_SM501', if_true: files('sm501.c'))
+system_ss.add(when: 'CONFIG_TCX', if_true: files('tcx.c'))
+system_ss.add(when: 'CONFIG_CG3', if_true: files('cg3.c'))
+system_ss.add(when: 'CONFIG_MACFB', if_true: files('macfb.c'))
+system_ss.add(when: 'CONFIG_NEXTCUBE', if_true: files('next-fb.c'))
 
-softmmu_ss.add(when: 'CONFIG_VGA', if_true: files('vga.c'))
+system_ss.add(when: 'CONFIG_VGA', if_true: files('vga.c'))
 
 if (config_all_devices.has_key('CONFIG_VGA_CIRRUS') or
     config_all_devices.has_key('CONFIG_VGA_PCI') or
     config_all_devices.has_key('CONFIG_VMWARE_VGA') or
     config_all_devices.has_key('CONFIG_ATI_VGA')
    )
-  softmmu_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
+  system_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'),
                                       if_false: files('acpi-vga-stub.c'))
 endif
 
@@ -XXX,XX +XXX,XX @@ if config_all_devices.has_key('CONFIG_QXL')
   hw_display_modules += {'qxl': qxl_ss}
 endif
 
-softmmu_ss.add(when: 'CONFIG_DPCD', if_true: files('dpcd.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dp.c'))
+system_ss.add(when: 'CONFIG_DPCD', if_true: files('dpcd.c'))
+system_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dp.c'))
 
-softmmu_ss.add(when: 'CONFIG_ARTIST', if_true: files('artist.c'))
+system_ss.add(when: 'CONFIG_ARTIST', if_true: files('artist.c'))
 
-softmmu_ss.add(when: [pixman, 'CONFIG_ATI_VGA'], if_true: files('ati.c', 'ati_2d.c', 'ati_dbg.c'))
+system_ss.add(when: [pixman, 'CONFIG_ATI_VGA'], if_true: files('ati.c', 'ati_2d.c', 'ati_dbg.c'))
 
 
 if config_all_devices.has_key('CONFIG_VIRTIO_GPU')
@@ -XXX,XX +XXX,XX @@ if config_all_devices.has_key('CONFIG_VIRTIO_VGA')
   hw_display_modules += {'virtio-vga-gl': virtio_vga_gl_ss}
 endif
 
-softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c'))
+system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c'))
 
-softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-vga-stub.c'))
+system_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-vga-stub.c'))
 modules += { 'hw-display': hw_display_modules }
diff --git a/hw/dma/meson.build b/hw/dma/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/dma/meson.build
+++ b/hw/dma/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_RC4030', if_true: files('rc4030.c'))
-softmmu_ss.add(when: 'CONFIG_PL080', if_true: files('pl080.c'))
-softmmu_ss.add(when: 'CONFIG_PL330', if_true: files('pl330.c'))
-softmmu_ss.add(when: 'CONFIG_I82374', if_true: files('i82374.c'))
-softmmu_ss.add(when: 'CONFIG_I8257', if_true: files('i8257.c'))
-softmmu_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('xilinx_axidma.c'))
-softmmu_ss.add(when: 'CONFIG_ZYNQ_DEVCFG', if_true: files('xlnx-zynq-devcfg.c'))
-softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_dma.c'))
-softmmu_ss.add(when: 'CONFIG_STP2000', if_true: files('sparc32_dma.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dpdma.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_ZDMA', if_true: files('xlnx-zdma.c'))
-softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dma.c', 'soc_dma.c'))
-softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_dma.c'))
-softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_dma.c'))
-softmmu_ss.add(when: 'CONFIG_SIFIVE_PDMA', if_true: files('sifive_pdma.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_CSU_DMA', if_true: files('xlnx_csu_dma.c'))
+system_ss.add(when: 'CONFIG_RC4030', if_true: files('rc4030.c'))
+system_ss.add(when: 'CONFIG_PL080', if_true: files('pl080.c'))
+system_ss.add(when: 'CONFIG_PL330', if_true: files('pl330.c'))
+system_ss.add(when: 'CONFIG_I82374', if_true: files('i82374.c'))
+system_ss.add(when: 'CONFIG_I8257', if_true: files('i8257.c'))
+system_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('xilinx_axidma.c'))
+system_ss.add(when: 'CONFIG_ZYNQ_DEVCFG', if_true: files('xlnx-zynq-devcfg.c'))
+system_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_dma.c'))
+system_ss.add(when: 'CONFIG_STP2000', if_true: files('sparc32_dma.c'))
+system_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dpdma.c'))
+system_ss.add(when: 'CONFIG_XLNX_ZDMA', if_true: files('xlnx-zdma.c'))
+system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dma.c', 'soc_dma.c'))
+system_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_dma.c'))
+system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_dma.c'))
+system_ss.add(when: 'CONFIG_SIFIVE_PDMA', if_true: files('sifive_pdma.c'))
+system_ss.add(when: 'CONFIG_XLNX_CSU_DMA', if_true: files('xlnx_csu_dma.c'))
diff --git a/hw/gpio/meson.build b/hw/gpio/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/gpio/meson.build
+++ b/hw/gpio/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_GPIO_KEY', if_true: files('gpio_key.c'))
-softmmu_ss.add(when: 'CONFIG_GPIO_MPC8XXX', if_true: files('mpc8xxx.c'))
-softmmu_ss.add(when: 'CONFIG_GPIO_PWR', if_true: files('gpio_pwr.c'))
-softmmu_ss.add(when: 'CONFIG_MAX7310', if_true: files('max7310.c'))
-softmmu_ss.add(when: 'CONFIG_PL061', if_true: files('pl061.c'))
-softmmu_ss.add(when: 'CONFIG_ZAURUS', if_true: files('zaurus.c'))
+system_ss.add(when: 'CONFIG_GPIO_KEY', if_true: files('gpio_key.c'))
+system_ss.add(when: 'CONFIG_GPIO_MPC8XXX', if_true: files('mpc8xxx.c'))
+system_ss.add(when: 'CONFIG_GPIO_PWR', if_true: files('gpio_pwr.c'))
+system_ss.add(when: 'CONFIG_MAX7310', if_true: files('max7310.c'))
+system_ss.add(when: 'CONFIG_PL061', if_true: files('pl061.c'))
+system_ss.add(when: 'CONFIG_ZAURUS', if_true: files('zaurus.c'))
 
-softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpio.c'))
-softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_gpio.c'))
-softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_gpio.c'))
-softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gpio.c'))
-softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_gpio.c'))
-softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_gpio.c'))
-softmmu_ss.add(when: 'CONFIG_SIFIVE_GPIO', if_true: files('sifive_gpio.c'))
+system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpio.c'))
+system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_gpio.c'))
+system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_gpio.c'))
+system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gpio.c'))
+system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_gpio.c'))
+system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_gpio.c'))
+system_ss.add(when: 'CONFIG_SIFIVE_GPIO', if_true: files('sifive_gpio.c'))
diff --git a/hw/i2c/meson.build b/hw/i2c/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/i2c/meson.build
+++ b/hw/i2c/meson.build
@@ -XXX,XX +XXX,XX @@ i2c_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_i2c.c'))
 i2c_ss.add(when: 'CONFIG_PPC4XX', if_true: files('ppc4xx_i2c.c'))
 i2c_ss.add(when: 'CONFIG_PCA954X', if_true: files('i2c_mux_pca954x.c'))
 i2c_ss.add(when: 'CONFIG_PMBUS', if_true: files('pmbus_device.c'))
-softmmu_ss.add_all(when: 'CONFIG_I2C', if_true: i2c_ss)
+system_ss.add_all(when: 'CONFIG_I2C', if_true: i2c_ss)
diff --git a/hw/ide/meson.build b/hw/ide/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/ide/meson.build
+++ b/hw/ide/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_AHCI', if_true: files('ahci.c'))
-softmmu_ss.add(when: 'CONFIG_AHCI_ICH9', if_true: files('ich.c'))
-softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('ahci-allwinner.c'))
-softmmu_ss.add(when: 'CONFIG_IDE_CMD646', if_true: files('cmd646.c'))
-softmmu_ss.add(when: 'CONFIG_IDE_CORE', if_true: files('core.c', 'atapi.c'))
-softmmu_ss.add(when: 'CONFIG_IDE_ISA', if_true: files('isa.c', 'ioport.c'))
-softmmu_ss.add(when: 'CONFIG_IDE_MACIO', if_true: files('macio.c'))
-softmmu_ss.add(when: 'CONFIG_IDE_MMIO', if_true: files('mmio.c'))
-softmmu_ss.add(when: 'CONFIG_IDE_PCI', if_true: files('pci.c'))
-softmmu_ss.add(when: 'CONFIG_IDE_PIIX', if_true: files('piix.c', 'ioport.c'))
-softmmu_ss.add(when: 'CONFIG_IDE_QDEV', if_true: files('qdev.c'))
-softmmu_ss.add(when: 'CONFIG_IDE_SII3112', if_true: files('sii3112.c'))
-softmmu_ss.add(when: 'CONFIG_IDE_VIA', if_true: files('via.c'))
-softmmu_ss.add(when: 'CONFIG_MICRODRIVE', if_true: files('microdrive.c'))
+system_ss.add(when: 'CONFIG_AHCI', if_true: files('ahci.c'))
+system_ss.add(when: 'CONFIG_AHCI_ICH9', if_true: files('ich.c'))
+system_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('ahci-allwinner.c'))
+system_ss.add(when: 'CONFIG_IDE_CMD646', if_true: files('cmd646.c'))
+system_ss.add(when: 'CONFIG_IDE_CORE', if_true: files('core.c', 'atapi.c'))
+system_ss.add(when: 'CONFIG_IDE_ISA', if_true: files('isa.c', 'ioport.c'))
+system_ss.add(when: 'CONFIG_IDE_MACIO', if_true: files('macio.c'))
+system_ss.add(when: 'CONFIG_IDE_MMIO', if_true: files('mmio.c'))
+system_ss.add(when: 'CONFIG_IDE_PCI', if_true: files('pci.c'))
+system_ss.add(when: 'CONFIG_IDE_PIIX', if_true: files('piix.c', 'ioport.c'))
+system_ss.add(when: 'CONFIG_IDE_QDEV', if_true: files('qdev.c'))
+system_ss.add(when: 'CONFIG_IDE_SII3112', if_true: files('sii3112.c'))
+system_ss.add(when: 'CONFIG_IDE_VIA', if_true: files('via.c'))
+system_ss.add(when: 'CONFIG_MICRODRIVE', if_true: files('microdrive.c'))
diff --git a/hw/input/meson.build b/hw/input/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/input/meson.build
+++ b/hw/input/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(files('hid.c'))
-softmmu_ss.add(when: 'CONFIG_ADB', if_true: files('adb.c', 'adb-mouse.c', 'adb-kbd.c'))
-softmmu_ss.add(when: 'CONFIG_ADS7846', if_true: files('ads7846.c'))
-softmmu_ss.add(when: 'CONFIG_LM832X', if_true: files('lm832x.c'))
-softmmu_ss.add(when: 'CONFIG_PCKBD', if_true: files('pckbd.c'))
-softmmu_ss.add(when: 'CONFIG_PL050', if_true: files('pl050.c'))
-softmmu_ss.add(when: 'CONFIG_PS2', if_true: files('ps2.c'))
-softmmu_ss.add(when: 'CONFIG_STELLARIS_INPUT', if_true: files('stellaris_input.c'))
-softmmu_ss.add(when: 'CONFIG_TSC2005', if_true: files('tsc2005.c'))
+system_ss.add(files('hid.c'))
+system_ss.add(when: 'CONFIG_ADB', if_true: files('adb.c', 'adb-mouse.c', 'adb-kbd.c'))
+system_ss.add(when: 'CONFIG_ADS7846', if_true: files('ads7846.c'))
+system_ss.add(when: 'CONFIG_LM832X', if_true: files('lm832x.c'))
+system_ss.add(when: 'CONFIG_PCKBD', if_true: files('pckbd.c'))
+system_ss.add(when: 'CONFIG_PL050', if_true: files('pl050.c'))
+system_ss.add(when: 'CONFIG_PS2', if_true: files('ps2.c'))
+system_ss.add(when: 'CONFIG_STELLARIS_INPUT', if_true: files('stellaris_input.c'))
+system_ss.add(when: 'CONFIG_TSC2005', if_true: files('tsc2005.c'))
 
-softmmu_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-input.c'))
-softmmu_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-input-hid.c'))
-softmmu_ss.add(when: 'CONFIG_VIRTIO_INPUT_HOST', if_true: files('virtio-input-host.c'))
-softmmu_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user-input.c'))
+system_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-input.c'))
+system_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-input-hid.c'))
+system_ss.add(when: 'CONFIG_VIRTIO_INPUT_HOST', if_true: files('virtio-input-host.c'))
+system_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user-input.c'))
 
-softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_keypad.c'))
-softmmu_ss.add(when: 'CONFIG_TSC210X', if_true: files('tsc210x.c'))
-softmmu_ss.add(when: 'CONFIG_LASIPS2', if_true: files('lasips2.c'))
+system_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_keypad.c'))
+system_ss.add(when: 'CONFIG_TSC210X', if_true: files('tsc210x.c'))
+system_ss.add(when: 'CONFIG_LASIPS2', if_true: files('lasips2.c'))
diff --git a/hw/intc/meson.build b/hw/intc/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/intc/meson.build
+++ b/hw/intc/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(files('intc.c'))
-softmmu_ss.add(when: 'CONFIG_ARM_GIC', if_true: files(
+system_ss.add(files('intc.c'))
+system_ss.add(when: 'CONFIG_ARM_GIC', if_true: files(
   'arm_gic.c',
   'arm_gic_common.c',
   'arm_gicv2m.c',
   'arm_gicv3_common.c',
   'arm_gicv3_its_common.c',
 ))
-softmmu_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files(
+system_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files(
   'arm_gicv3.c',
   'arm_gicv3_dist.c',
   'arm_gicv3_its.c',
   'arm_gicv3_redist.c',
 ))
-softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10_PIC', if_true: files('allwinner-a10-pic.c'))
-softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_vic.c'))
-softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_pic.c'))
-softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_gic.c', 'exynos4210_combiner.c'))
-softmmu_ss.add(when: 'CONFIG_GOLDFISH_PIC', if_true: files('goldfish_pic.c'))
-softmmu_ss.add(when: 'CONFIG_HEATHROW_PIC', if_true: files('heathrow_pic.c'))
-softmmu_ss.add(when: 'CONFIG_I8259', if_true: files('i8259_common.c', 'i8259.c'))
-softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_avic.c', 'imx_gpcv2.c'))
-softmmu_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic_common.c'))
-softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_intc.c'))
-softmmu_ss.add(when: 'CONFIG_OPENPIC', if_true: files('openpic.c'))
-softmmu_ss.add(when: 'CONFIG_PL190', if_true: files('pl190.c'))
-softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_ic.c', 'bcm2836_control.c'))
-softmmu_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_gic.c'))
-softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_intctl.c'))
-softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_intc.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-ipi.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_PMU', if_true: files('xlnx-pmu-iomod-intc.c'))
+system_ss.add(when: 'CONFIG_ALLWINNER_A10_PIC', if_true: files('allwinner-a10-pic.c'))
+system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_vic.c'))
+system_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_pic.c'))
+system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_gic.c', 'exynos4210_combiner.c'))
+system_ss.add(when: 'CONFIG_GOLDFISH_PIC', if_true: files('goldfish_pic.c'))
+system_ss.add(when: 'CONFIG_HEATHROW_PIC', if_true: files('heathrow_pic.c'))
+system_ss.add(when: 'CONFIG_I8259', if_true: files('i8259_common.c', 'i8259.c'))
+system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_avic.c', 'imx_gpcv2.c'))
+system_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic_common.c'))
+system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_intc.c'))
+system_ss.add(when: 'CONFIG_OPENPIC', if_true: files('openpic.c'))
+system_ss.add(when: 'CONFIG_PL190', if_true: files('pl190.c'))
+system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_ic.c', 'bcm2836_control.c'))
+system_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_gic.c'))
+system_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_intctl.c'))
+system_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_intc.c'))
+system_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-ipi.c'))
+system_ss.add(when: 'CONFIG_XLNX_ZYNQMP_PMU', if_true: files('xlnx-pmu-iomod-intc.c'))
 
 if config_all_devices.has_key('CONFIG_APIC') or \
    config_all_devices.has_key('CONFIG_I8259') or \
    config_all_devices.has_key('CONFIG_MC146818RTC')
-    softmmu_ss.add(files('kvm_irqcount.c'))
+    system_ss.add(files('kvm_irqcount.c'))
 endif
 
 specific_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c', 'apic_common.c'))
diff --git a/hw/ipack/meson.build b/hw/ipack/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/ipack/meson.build
+++ b/hw/ipack/meson.build
@@ -1 +1 @@
-softmmu_ss.add(when: 'CONFIG_IPACK', if_true: files('ipack.c', 'tpci200.c'))
+system_ss.add(when: 'CONFIG_IPACK', if_true: files('ipack.c', 'tpci200.c'))
diff --git a/hw/ipmi/meson.build b/hw/ipmi/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/ipmi/meson.build
+++ b/hw/ipmi/meson.build
@@ -XXX,XX +XXX,XX @@ ipmi_ss.add(when: 'CONFIG_ISA_IPMI_BT', if_true: files('isa_ipmi_bt.c'))
 ipmi_ss.add(when: 'CONFIG_PCI_IPMI_BT', if_true: files('pci_ipmi_bt.c'))
 ipmi_ss.add(when: 'CONFIG_IPMI_SSIF', if_true: files('smbus_ipmi.c'))
 
-softmmu_ss.add_all(when: 'CONFIG_IPMI', if_true: ipmi_ss)
+system_ss.add_all(when: 'CONFIG_IPMI', if_true: ipmi_ss)
diff --git a/hw/isa/meson.build b/hw/isa/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/isa/meson.build
+++ b/hw/isa/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_APM', if_true: files('apm.c'))
-softmmu_ss.add(when: 'CONFIG_I82378', if_true: files('i82378.c'))
-softmmu_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('isa-bus.c'))
-softmmu_ss.add(when: 'CONFIG_ISA_SUPERIO', if_true: files('isa-superio.c'))
-softmmu_ss.add(when: 'CONFIG_PC87312', if_true: files('pc87312.c'))
-softmmu_ss.add(when: 'CONFIG_PIIX3', if_true: files('piix3.c'))
-softmmu_ss.add(when: 'CONFIG_PIIX4', if_true: files('piix4.c'))
-softmmu_ss.add(when: 'CONFIG_SMC37C669', if_true: files('smc37c669-superio.c'))
-softmmu_ss.add(when: 'CONFIG_VT82C686', if_true: files('vt82c686.c'))
+system_ss.add(when: 'CONFIG_APM', if_true: files('apm.c'))
+system_ss.add(when: 'CONFIG_I82378', if_true: files('i82378.c'))
+system_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('isa-bus.c'))
+system_ss.add(when: 'CONFIG_ISA_SUPERIO', if_true: files('isa-superio.c'))
+system_ss.add(when: 'CONFIG_PC87312', if_true: files('pc87312.c'))
+system_ss.add(when: 'CONFIG_PIIX3', if_true: files('piix3.c'))
+system_ss.add(when: 'CONFIG_PIIX4', if_true: files('piix4.c'))
+system_ss.add(when: 'CONFIG_SMC37C669', if_true: files('smc37c669-superio.c'))
+system_ss.add(when: 'CONFIG_VT82C686', if_true: files('vt82c686.c'))
 
 specific_ss.add(when: 'CONFIG_LPC_ICH9', if_true: files('lpc_ich9.c'))
diff --git a/hw/mem/meson.build b/hw/mem/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/mem/meson.build
+++ b/hw/mem/meson.build
@@ -XXX,XX +XXX,XX @@ mem_ss.add(when: 'CONFIG_DIMM', if_true: files('pc-dimm.c'))
 mem_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_mc.c'))
 mem_ss.add(when: 'CONFIG_NVDIMM', if_true: files('nvdimm.c'))
 mem_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_true: files('cxl_type3.c'))
-softmmu_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_false: files('cxl_type3_stubs.c'))
-softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('cxl_type3_stubs.c'))
+system_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_false: files('cxl_type3_stubs.c'))
+system_ss.add(when: 'CONFIG_ALL', if_true: files('cxl_type3_stubs.c'))
 
-softmmu_ss.add_all(when: 'CONFIG_MEM_DEVICE', if_true: mem_ss)
+system_ss.add_all(when: 'CONFIG_MEM_DEVICE', if_true: mem_ss)
 
-softmmu_ss.add(when: 'CONFIG_SPARSE_MEM', if_true: files('sparse-mem.c'))
+system_ss.add(when: 'CONFIG_SPARSE_MEM', if_true: files('sparse-mem.c'))
diff --git a/hw/misc/macio/meson.build b/hw/misc/macio/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/misc/macio/meson.build
+++ b/hw/misc/macio/meson.build
@@ -XXX,XX +XXX,XX @@ macio_ss.add(when: 'CONFIG_MACIO_GPIO', if_true: files('gpio.c'))
 macio_ss.add(when: 'CONFIG_MAC_DBDMA', if_true: files('mac_dbdma.c'))
 macio_ss.add(when: 'CONFIG_MAC_PMU', if_true: files('pmu.c'))
 
-softmmu_ss.add_all(when: 'CONFIG_MACIO', if_true: macio_ss)
+system_ss.add_all(when: 'CONFIG_MACIO', if_true: macio_ss)
diff --git a/hw/misc/meson.build b/hw/misc/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/misc/meson.build
+++ b/hw/misc/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_APPLESMC', if_true: files('applesmc.c'))
-softmmu_ss.add(when: 'CONFIG_EDU', if_true: files('edu.c'))
-softmmu_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('vmcoreinfo.c'))
-softmmu_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugexit.c'))
-softmmu_ss.add(when: 'CONFIG_ISA_TESTDEV', if_true: files('pc-testdev.c'))
-softmmu_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c'))
-softmmu_ss.add(when: 'CONFIG_PCI_TESTDEV', if_true: files('pci-testdev.c'))
-softmmu_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c'))
-softmmu_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c'))
-softmmu_ss.add(when: 'CONFIG_LED', if_true: files('led.c'))
-softmmu_ss.add(when: 'CONFIG_PVPANIC_COMMON', if_true: files('pvpanic.c'))
+system_ss.add(when: 'CONFIG_APPLESMC', if_true: files('applesmc.c'))
+system_ss.add(when: 'CONFIG_EDU', if_true: files('edu.c'))
+system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('vmcoreinfo.c'))
+system_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugexit.c'))
+system_ss.add(when: 'CONFIG_ISA_TESTDEV', if_true: files('pc-testdev.c'))
+system_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c'))
+system_ss.add(when: 'CONFIG_PCI_TESTDEV', if_true: files('pci-testdev.c'))
+system_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c'))
+system_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c'))
+system_ss.add(when: 'CONFIG_LED', if_true: files('led.c'))
+system_ss.add(when: 'CONFIG_PVPANIC_COMMON', if_true: files('pvpanic.c'))
 
 # ARM devices
-softmmu_ss.add(when: 'CONFIG_PL310', if_true: files('arm_l2x0.c'))
-softmmu_ss.add(when: 'CONFIG_INTEGRATOR_DEBUG', if_true: files('arm_integrator_debug.c'))
-softmmu_ss.add(when: 'CONFIG_A9SCU', if_true: files('a9scu.c'))
-softmmu_ss.add(when: 'CONFIG_ARM11SCU', if_true: files('arm11scu.c'))
+system_ss.add(when: 'CONFIG_PL310', if_true: files('arm_l2x0.c'))
+system_ss.add(when: 'CONFIG_INTEGRATOR_DEBUG', if_true: files('arm_integrator_debug.c'))
+system_ss.add(when: 'CONFIG_A9SCU', if_true: files('a9scu.c'))
+system_ss.add(when: 'CONFIG_ARM11SCU', if_true: files('arm11scu.c'))
 
-softmmu_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_ras.c'))
+system_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_ras.c'))
 
 # Mac devices
-softmmu_ss.add(when: 'CONFIG_MOS6522', if_true: files('mos6522.c'))
+system_ss.add(when: 'CONFIG_MOS6522', if_true: files('mos6522.c'))
 
 # virt devices
-softmmu_ss.add(when: 'CONFIG_VIRT_CTRL', if_true: files('virt_ctrl.c'))
+system_ss.add(when: 'CONFIG_VIRT_CTRL', if_true: files('virt_ctrl.c'))
 
 # RISC-V devices
-softmmu_ss.add(when: 'CONFIG_MCHP_PFSOC_DMC', if_true: files('mchp_pfsoc_dmc.c'))
-softmmu_ss.add(when: 'CONFIG_MCHP_PFSOC_IOSCB', if_true: files('mchp_pfsoc_ioscb.c'))
-softmmu_ss.add(when: 'CONFIG_MCHP_PFSOC_SYSREG', if_true: files('mchp_pfsoc_sysreg.c'))
-softmmu_ss.add(when: 'CONFIG_SIFIVE_TEST', if_true: files('sifive_test.c'))
-softmmu_ss.add(when: 'CONFIG_SIFIVE_E_PRCI', if_true: files('sifive_e_prci.c'))
-softmmu_ss.add(when: 'CONFIG_SIFIVE_U_OTP', if_true: files('sifive_u_otp.c'))
-softmmu_ss.add(when: 'CONFIG_SIFIVE_U_PRCI', if_true: files('sifive_u_prci.c'))
+system_ss.add(when: 'CONFIG_MCHP_PFSOC_DMC', if_true: files('mchp_pfsoc_dmc.c'))
+system_ss.add(when: 'CONFIG_MCHP_PFSOC_IOSCB', if_true: files('mchp_pfsoc_ioscb.c'))
+system_ss.add(when: 'CONFIG_MCHP_PFSOC_SYSREG', if_true: files('mchp_pfsoc_sysreg.c'))
+system_ss.add(when: 'CONFIG_SIFIVE_TEST', if_true: files('sifive_test.c'))
+system_ss.add(when: 'CONFIG_SIFIVE_E_PRCI', if_true: files('sifive_e_prci.c'))
+system_ss.add(when: 'CONFIG_SIFIVE_U_OTP', if_true: files('sifive_u_otp.c'))
+system_ss.add(when: 'CONFIG_SIFIVE_U_PRCI', if_true: files('sifive_u_prci.c'))
 
 subdir('macio')
 
-softmmu_ss.add(when: 'CONFIG_IVSHMEM_DEVICE', if_true: files('ivshmem.c'))
+system_ss.add(when: 'CONFIG_IVSHMEM_DEVICE', if_true: files('ivshmem.c'))
 
-softmmu_ss.add(when: 'CONFIG_ALLWINNER_SRAMC', if_true: files('allwinner-sramc.c'))
-softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10_CCM', if_true: files('allwinner-a10-ccm.c'))
-softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10_DRAMC', if_true: files('allwinner-a10-dramc.c'))
-softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-ccu.c'))
+system_ss.add(when: 'CONFIG_ALLWINNER_SRAMC', if_true: files('allwinner-sramc.c'))
+system_ss.add(when: 'CONFIG_ALLWINNER_A10_CCM', if_true: files('allwinner-a10-ccm.c'))
+system_ss.add(when: 'CONFIG_ALLWINNER_A10_DRAMC', if_true: files('allwinner-a10-dramc.c'))
+system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-ccu.c'))
 specific_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-cpucfg.c'))
-softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-dramc.c'))
-softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-sysctrl.c'))
-softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sid.c'))
-softmmu_ss.add(when: 'CONFIG_ALLWINNER_R40', if_true: files('allwinner-r40-ccu.c'))
-softmmu_ss.add(when: 'CONFIG_ALLWINNER_R40', if_true: files('allwinner-r40-dramc.c'))
-softmmu_ss.add(when: 'CONFIG_AXP2XX_PMU', if_true: files('axp2xx.c'))
-softmmu_ss.add(when: 'CONFIG_REALVIEW', if_true: files('arm_sysctl.c'))
-softmmu_ss.add(when: 'CONFIG_NSERIES', if_true: files('cbus.c'))
-softmmu_ss.add(when: 'CONFIG_ECCMEMCTL', if_true: files('eccmemctl.c'))
-softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pmu.c', 'exynos4210_clk.c', 'exynos4210_rng.c'))
-softmmu_ss.add(when: 'CONFIG_IMX', if_true: files(
+system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-dramc.c'))
+system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-sysctrl.c'))
+system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sid.c'))
+system_ss.add(when: 'CONFIG_ALLWINNER_R40', if_true: files('allwinner-r40-ccu.c'))
+system_ss.add(when: 'CONFIG_ALLWINNER_R40', if_true: files('allwinner-r40-dramc.c'))
+system_ss.add(when: 'CONFIG_AXP2XX_PMU', if_true: files('axp2xx.c'))
+system_ss.add(when: 'CONFIG_REALVIEW', if_true: files('arm_sysctl.c'))
+system_ss.add(when: 'CONFIG_NSERIES', if_true: files('cbus.c'))
+system_ss.add(when: 'CONFIG_ECCMEMCTL', if_true: files('eccmemctl.c'))
+system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pmu.c', 'exynos4210_clk.c', 'exynos4210_rng.c'))
+system_ss.add(when: 'CONFIG_IMX', if_true: files(
   'imx25_ccm.c',
   'imx31_ccm.c',
   'imx6_ccm.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(when: 'CONFIG_IMX', if_true: files(
   'imx_ccm.c',
   'imx_rngc.c',
 ))
-softmmu_ss.add(when: 'CONFIG_MAINSTONE', if_true: files('mst_fpga.c'))
-softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files(
+system_ss.add(when: 'CONFIG_MAINSTONE', if_true: files('mst_fpga.c'))
+system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files(
   'npcm7xx_clk.c',
   'npcm7xx_gcr.c',
   'npcm7xx_mft.c',
   'npcm7xx_pwm.c',
   'npcm7xx_rng.c',
 ))
-softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files(
+system_ss.add(when: 'CONFIG_OMAP', if_true: files(
   'omap_clk.c',
   'omap_gpmc.c',
   'omap_l4.c',
   'omap_sdrc.c',
   'omap_tap.c',
 ))
-softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files(
+system_ss.add(when: 'CONFIG_RASPI', if_true: files(
   'bcm2835_mbox.c',
   'bcm2835_mphi.c',
   'bcm2835_property.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files(
   'bcm2835_cprman.c',
   'bcm2835_powermgt.c',
 ))
-softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_misc.c'))
-softmmu_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq_slcr.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp-crf.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp-apu-ctrl.c'))
+system_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_misc.c'))
+system_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq_slcr.c'))
+system_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp-crf.c'))
+system_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp-apu-ctrl.c'))
 specific_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-crl.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files(
+system_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files(
   'xlnx-versal-xramc.c',
   'xlnx-versal-pmc-iou-slcr.c',
 ))
-softmmu_ss.add(when: 'CONFIG_STM32F2XX_SYSCFG', if_true: files('stm32f2xx_syscfg.c'))
-softmmu_ss.add(when: 'CONFIG_STM32F4XX_SYSCFG', if_true: files('stm32f4xx_syscfg.c'))
-softmmu_ss.add(when: 'CONFIG_STM32F4XX_EXTI', if_true: files('stm32f4xx_exti.c'))
-softmmu_ss.add(when: 'CONFIG_MPS2_FPGAIO', if_true: files('mps2-fpgaio.c'))
-softmmu_ss.add(when: 'CONFIG_MPS2_SCC', if_true: files('mps2-scc.c'))
+system_ss.add(when: 'CONFIG_STM32F2XX_SYSCFG', if_true: files('stm32f2xx_syscfg.c'))
+system_ss.add(when: 'CONFIG_STM32F4XX_SYSCFG', if_true: files('stm32f4xx_syscfg.c'))
+system_ss.add(when: 'CONFIG_STM32F4XX_EXTI', if_true: files('stm32f4xx_exti.c'))
+system_ss.add(when: 'CONFIG_MPS2_FPGAIO', if_true: files('mps2-fpgaio.c'))
+system_ss.add(when: 'CONFIG_MPS2_SCC', if_true: files('mps2-scc.c'))
 
-softmmu_ss.add(when: 'CONFIG_TZ_MPC', if_true: files('tz-mpc.c'))
-softmmu_ss.add(when: 'CONFIG_TZ_MSC', if_true: files('tz-msc.c'))
-softmmu_ss.add(when: 'CONFIG_TZ_PPC', if_true: files('tz-ppc.c'))
-softmmu_ss.add(when: 'CONFIG_IOTKIT_SECCTL', if_true: files('iotkit-secctl.c'))
-softmmu_ss.add(when: 'CONFIG_IOTKIT_SYSCTL', if_true: files('iotkit-sysctl.c'))
-softmmu_ss.add(when: 'CONFIG_IOTKIT_SYSINFO', if_true: files('iotkit-sysinfo.c'))
-softmmu_ss.add(when: 'CONFIG_ARMSSE_CPU_PWRCTRL', if_true: files('armsse-cpu-pwrctrl.c'))
-softmmu_ss.add(when: 'CONFIG_ARMSSE_CPUID', if_true: files('armsse-cpuid.c'))
-softmmu_ss.add(when: 'CONFIG_ARMSSE_MHU', if_true: files('armsse-mhu.c'))
+system_ss.add(when: 'CONFIG_TZ_MPC', if_true: files('tz-mpc.c'))
+system_ss.add(when: 'CONFIG_TZ_MSC', if_true: files('tz-msc.c'))
+system_ss.add(when: 'CONFIG_TZ_PPC', if_true: files('tz-ppc.c'))
+system_ss.add(when: 'CONFIG_IOTKIT_SECCTL', if_true: files('iotkit-secctl.c'))
+system_ss.add(when: 'CONFIG_IOTKIT_SYSCTL', if_true: files('iotkit-sysctl.c'))
+system_ss.add(when: 'CONFIG_IOTKIT_SYSINFO', if_true: files('iotkit-sysinfo.c'))
+system_ss.add(when: 'CONFIG_ARMSSE_CPU_PWRCTRL', if_true: files('armsse-cpu-pwrctrl.c'))
+system_ss.add(when: 'CONFIG_ARMSSE_CPUID', if_true: files('armsse-cpuid.c'))
+system_ss.add(when: 'CONFIG_ARMSSE_MHU', if_true: files('armsse-mhu.c'))
 
-softmmu_ss.add(when: 'CONFIG_PVPANIC_ISA', if_true: files('pvpanic-isa.c'))
-softmmu_ss.add(when: 'CONFIG_PVPANIC_PCI', if_true: files('pvpanic-pci.c'))
-softmmu_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c'))
-softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files(
+system_ss.add(when: 'CONFIG_PVPANIC_ISA', if_true: files('pvpanic-isa.c'))
+system_ss.add(when: 'CONFIG_PVPANIC_PCI', if_true: files('pvpanic-pci.c'))
+system_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c'))
+system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files(
   'aspeed_hace.c',
   'aspeed_i3c.c',
   'aspeed_lpc.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files(
   'aspeed_xdma.c',
   'aspeed_peci.c'))
 
-softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c'))
-softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_rng.c'))
+system_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c'))
+system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_rng.c'))
 
-softmmu_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_ahb_apb_pnp.c'))
+system_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_ahb_apb_pnp.c'))
 
-softmmu_ss.add(when: 'CONFIG_I2C', if_true: files('i2c-echo.c'))
+system_ss.add(when: 'CONFIG_I2C', if_true: files('i2c-echo.c'))
 
 specific_ss.add(when: 'CONFIG_AVR_POWER', if_true: files('avr_power.c'))
 
@@ -XXX,XX +XXX,XX @@ specific_ss.add(when: 'CONFIG_MAC_VIA', if_true: files('mac_via.c'))
 specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_cmgcr.c', 'mips_cpc.c'))
 specific_ss.add(when: 'CONFIG_MIPS_ITU', if_true: files('mips_itu.c'))
 
-softmmu_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa_ec.c'))
+system_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa_ec.c'))
 
 # HPPA devices
-softmmu_ss.add(when: 'CONFIG_LASI', if_true: files('lasi.c'))
+system_ss.add(when: 'CONFIG_LASI', if_true: files('lasi.c'))
diff --git a/hw/net/can/meson.build b/hw/net/can/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/can/meson.build
+++ b/hw/net/can/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_CAN_SJA1000', if_true: files('can_sja1000.c'))
-softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_kvaser_pci.c'))
-softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_pcm3680_pci.c'))
-softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_mioe3680_pci.c'))
-softmmu_ss.add(when: 'CONFIG_CAN_CTUCANFD', if_true: files('ctucan_core.c'))
-softmmu_ss.add(when: 'CONFIG_CAN_CTUCANFD_PCI', if_true: files('ctucan_pci.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-can.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-canfd.c'))
+system_ss.add(when: 'CONFIG_CAN_SJA1000', if_true: files('can_sja1000.c'))
+system_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_kvaser_pci.c'))
+system_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_pcm3680_pci.c'))
+system_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_mioe3680_pci.c'))
+system_ss.add(when: 'CONFIG_CAN_CTUCANFD', if_true: files('ctucan_core.c'))
+system_ss.add(when: 'CONFIG_CAN_CTUCANFD_PCI', if_true: files('ctucan_pci.c'))
+system_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-can.c'))
+system_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-canfd.c'))
diff --git a/hw/net/meson.build b/hw/net/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/meson.build
+++ b/hw/net/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_DP8393X', if_true: files('dp8393x.c'))
-softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen_nic.c'))
-softmmu_ss.add(when: 'CONFIG_NE2000_COMMON', if_true: files('ne2000.c'))
+system_ss.add(when: 'CONFIG_DP8393X', if_true: files('dp8393x.c'))
+system_ss.add(when: 'CONFIG_XEN', if_true: files('xen_nic.c'))
+system_ss.add(when: 'CONFIG_NE2000_COMMON', if_true: files('ne2000.c'))
 
 # PCI network cards
-softmmu_ss.add(when: 'CONFIG_NE2000_PCI', if_true: files('ne2000-pci.c'))
-softmmu_ss.add(when: 'CONFIG_EEPRO100_PCI', if_true: files('eepro100.c'))
-softmmu_ss.add(when: 'CONFIG_PCNET_PCI', if_true: files('pcnet-pci.c'))
-softmmu_ss.add(when: 'CONFIG_PCNET_COMMON', if_true: files('pcnet.c'))
-softmmu_ss.add(when: 'CONFIG_E1000_PCI', if_true: files('e1000.c', 'e1000x_common.c'))
-softmmu_ss.add(when: 'CONFIG_E1000E_PCI_EXPRESS', if_true: files('net_tx_pkt.c', 'net_rx_pkt.c'))
-softmmu_ss.add(when: 'CONFIG_E1000E_PCI_EXPRESS', if_true: files('e1000e.c', 'e1000e_core.c', 'e1000x_common.c'))
-softmmu_ss.add(when: 'CONFIG_IGB_PCI_EXPRESS', if_true: files('net_tx_pkt.c', 'net_rx_pkt.c'))
-softmmu_ss.add(when: 'CONFIG_IGB_PCI_EXPRESS', if_true: files('igb.c', 'igbvf.c', 'igb_core.c'))
-softmmu_ss.add(when: 'CONFIG_RTL8139_PCI', if_true: files('rtl8139.c'))
-softmmu_ss.add(when: 'CONFIG_TULIP', if_true: files('tulip.c'))
-softmmu_ss.add(when: 'CONFIG_VMXNET3_PCI', if_true: files('net_tx_pkt.c', 'net_rx_pkt.c'))
-softmmu_ss.add(when: 'CONFIG_VMXNET3_PCI', if_true: files('vmxnet3.c'))
+system_ss.add(when: 'CONFIG_NE2000_PCI', if_true: files('ne2000-pci.c'))
+system_ss.add(when: 'CONFIG_EEPRO100_PCI', if_true: files('eepro100.c'))
+system_ss.add(when: 'CONFIG_PCNET_PCI', if_true: files('pcnet-pci.c'))
+system_ss.add(when: 'CONFIG_PCNET_COMMON', if_true: files('pcnet.c'))
+system_ss.add(when: 'CONFIG_E1000_PCI', if_true: files('e1000.c', 'e1000x_common.c'))
+system_ss.add(when: 'CONFIG_E1000E_PCI_EXPRESS', if_true: files('net_tx_pkt.c', 'net_rx_pkt.c'))
+system_ss.add(when: 'CONFIG_E1000E_PCI_EXPRESS', if_true: files('e1000e.c', 'e1000e_core.c', 'e1000x_common.c'))
+system_ss.add(when: 'CONFIG_IGB_PCI_EXPRESS', if_true: files('net_tx_pkt.c', 'net_rx_pkt.c'))
+system_ss.add(when: 'CONFIG_IGB_PCI_EXPRESS', if_true: files('igb.c', 'igbvf.c', 'igb_core.c'))
+system_ss.add(when: 'CONFIG_RTL8139_PCI', if_true: files('rtl8139.c'))
+system_ss.add(when: 'CONFIG_TULIP', if_true: files('tulip.c'))
+system_ss.add(when: 'CONFIG_VMXNET3_PCI', if_true: files('net_tx_pkt.c', 'net_rx_pkt.c'))
+system_ss.add(when: 'CONFIG_VMXNET3_PCI', if_true: files('vmxnet3.c'))
 
-softmmu_ss.add(when: 'CONFIG_SMC91C111', if_true: files('smc91c111.c'))
-softmmu_ss.add(when: 'CONFIG_LAN9118', if_true: files('lan9118.c'))
-softmmu_ss.add(when: 'CONFIG_NE2000_ISA', if_true: files('ne2000-isa.c'))
-softmmu_ss.add(when: 'CONFIG_OPENCORES_ETH', if_true: files('opencores_eth.c'))
-softmmu_ss.add(when: 'CONFIG_XGMAC', if_true: files('xgmac.c'))
-softmmu_ss.add(when: 'CONFIG_MIPSNET', if_true: files('mipsnet.c'))
-softmmu_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('xilinx_axienet.c'))
-softmmu_ss.add(when: 'CONFIG_ALLWINNER_EMAC', if_true: files('allwinner_emac.c'))
-softmmu_ss.add(when: 'CONFIG_ALLWINNER_SUN8I_EMAC', if_true: files('allwinner-sun8i-emac.c'))
-softmmu_ss.add(when: 'CONFIG_IMX_FEC', if_true: files('imx_fec.c'))
-softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-emac.c'))
-softmmu_ss.add(when: 'CONFIG_MARVELL_88W8618', if_true: files('mv88w8618_eth.c'))
+system_ss.add(when: 'CONFIG_SMC91C111', if_true: files('smc91c111.c'))
+system_ss.add(when: 'CONFIG_LAN9118', if_true: files('lan9118.c'))
+system_ss.add(when: 'CONFIG_NE2000_ISA', if_true: files('ne2000-isa.c'))
+system_ss.add(when: 'CONFIG_OPENCORES_ETH', if_true: files('opencores_eth.c'))
+system_ss.add(when: 'CONFIG_XGMAC', if_true: files('xgmac.c'))
+system_ss.add(when: 'CONFIG_MIPSNET', if_true: files('mipsnet.c'))
+system_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('xilinx_axienet.c'))
+system_ss.add(when: 'CONFIG_ALLWINNER_EMAC', if_true: files('allwinner_emac.c'))
+system_ss.add(when: 'CONFIG_ALLWINNER_SUN8I_EMAC', if_true: files('allwinner-sun8i-emac.c'))
+system_ss.add(when: 'CONFIG_IMX_FEC', if_true: files('imx_fec.c'))
+system_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-emac.c'))
+system_ss.add(when: 'CONFIG_MARVELL_88W8618', if_true: files('mv88w8618_eth.c'))
 
-softmmu_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_gem.c'))
-softmmu_ss.add(when: 'CONFIG_STELLARIS_ENET', if_true: files('stellaris_enet.c'))
-softmmu_ss.add(when: 'CONFIG_LANCE', if_true: files('lance.c'))
-softmmu_ss.add(when: 'CONFIG_LASI_I82596', if_true: files('lasi_i82596.c'))
-softmmu_ss.add(when: 'CONFIG_I82596_COMMON', if_true: files('i82596.c'))
-softmmu_ss.add(when: 'CONFIG_SUNHME', if_true: files('sunhme.c'))
-softmmu_ss.add(when: 'CONFIG_FTGMAC100', if_true: files('ftgmac100.c'))
-softmmu_ss.add(when: 'CONFIG_SUNGEM', if_true: files('sungem.c'))
-softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_emc.c'))
+system_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_gem.c'))
+system_ss.add(when: 'CONFIG_STELLARIS_ENET', if_true: files('stellaris_enet.c'))
+system_ss.add(when: 'CONFIG_LANCE', if_true: files('lance.c'))
+system_ss.add(when: 'CONFIG_LASI_I82596', if_true: files('lasi_i82596.c'))
+system_ss.add(when: 'CONFIG_I82596_COMMON', if_true: files('i82596.c'))
+system_ss.add(when: 'CONFIG_SUNHME', if_true: files('sunhme.c'))
+system_ss.add(when: 'CONFIG_FTGMAC100', if_true: files('ftgmac100.c'))
+system_ss.add(when: 'CONFIG_SUNGEM', if_true: files('sungem.c'))
+system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_emc.c'))
 
-softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_eth.c'))
-softmmu_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_fec.c'))
+system_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_eth.c'))
+system_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_fec.c'))
 specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_llan.c'))
-softmmu_ss.add(when: 'CONFIG_XILINX_ETHLITE', if_true: files('xilinx_ethlite.c'))
+system_ss.add(when: 'CONFIG_XILINX_ETHLITE', if_true: files('xilinx_ethlite.c'))
 
-softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('net_rx_pkt.c'))
+system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('net_rx_pkt.c'))
 specific_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net.c'))
 
 if have_vhost_net
-  softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost_net.c'), if_false: files('vhost_net-stub.c'))
-  softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost_net-stub.c'))
+  system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost_net.c'), if_false: files('vhost_net-stub.c'))
+  system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost_net-stub.c'))
 else
-  softmmu_ss.add(files('vhost_net-stub.c'))
+  system_ss.add(files('vhost_net-stub.c'))
 endif
 
-softmmu_ss.add(when: 'CONFIG_ETSEC', if_true: files(
+system_ss.add(when: 'CONFIG_ETSEC', if_true: files(
   'fsl_etsec/etsec.c',
   'fsl_etsec/miim.c',
   'fsl_etsec/registers.c',
   'fsl_etsec/rings.c',
 ))
 
-softmmu_ss.add(when: 'CONFIG_ROCKER', if_true: files(
+system_ss.add(when: 'CONFIG_ROCKER', if_true: files(
   'rocker/rocker.c',
   'rocker/rocker_desc.c',
   'rocker/rocker_fp.c',
   'rocker/rocker_of_dpa.c',
   'rocker/rocker_world.c',
 ), if_false: files('rocker/qmp-norocker.c'))
-softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('rocker/qmp-norocker.c'))
-softmmu_ss.add(files('rocker/rocker-hmp-cmds.c'))
+system_ss.add(when: 'CONFIG_ALL', if_true: files('rocker/qmp-norocker.c'))
+system_ss.add(files('rocker/rocker-hmp-cmds.c'))
 
 subdir('can')
diff --git a/hw/nubus/meson.build b/hw/nubus/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/nubus/meson.build
+++ b/hw/nubus/meson.build
@@ -XXX,XX +XXX,XX @@ nubus_ss.add(files('nubus-bus.c'))
 nubus_ss.add(files('nubus-bridge.c'))
 nubus_ss.add(when: 'CONFIG_Q800', if_true: files('mac-nubus-bridge.c'))
 
-softmmu_ss.add_all(when: 'CONFIG_NUBUS', if_true: nubus_ss)
+system_ss.add_all(when: 'CONFIG_NUBUS', if_true: nubus_ss)
diff --git a/hw/nvme/meson.build b/hw/nvme/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/nvme/meson.build
+++ b/hw/nvme/meson.build
@@ -1 +1 @@
-softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('ctrl.c', 'dif.c', 'ns.c', 'subsys.c'))
+system_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('ctrl.c', 'dif.c', 'ns.c', 'subsys.c'))
diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/nvram/meson.build
+++ b/hw/nvram/meson.build
@@ -XXX,XX +XXX,XX @@ if have_system or have_tools
   qom_ss.add(files('fw_cfg-interface.c'))
 endif
 
-softmmu_ss.add(files('fw_cfg.c'))
-softmmu_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c'))
-softmmu_ss.add(when: 'CONFIG_DS1225Y', if_true: files('ds1225y.c'))
-softmmu_ss.add(when: 'CONFIG_NMC93XX_EEPROM', if_true: files('eeprom93xx.c'))
-softmmu_ss.add(when: 'CONFIG_AT24C', if_true: files('eeprom_at24c.c'))
-softmmu_ss.add(when: 'CONFIG_MAC_NVRAM', if_true: files('mac_nvram.c'))
-softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_otp.c'))
-softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_nvm.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_EFUSE_CRC', if_true: files('xlnx-efuse-crc.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_EFUSE', if_true: files('xlnx-efuse.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_EFUSE_VERSAL', if_true: files(
+system_ss.add(files('fw_cfg.c'))
+system_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c'))
+system_ss.add(when: 'CONFIG_DS1225Y', if_true: files('ds1225y.c'))
+system_ss.add(when: 'CONFIG_NMC93XX_EEPROM', if_true: files('eeprom93xx.c'))
+system_ss.add(when: 'CONFIG_AT24C', if_true: files('eeprom_at24c.c'))
+system_ss.add(when: 'CONFIG_MAC_NVRAM', if_true: files('mac_nvram.c'))
+system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_otp.c'))
+system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_nvm.c'))
+system_ss.add(when: 'CONFIG_XLNX_EFUSE_CRC', if_true: files('xlnx-efuse-crc.c'))
+system_ss.add(when: 'CONFIG_XLNX_EFUSE', if_true: files('xlnx-efuse.c'))
+system_ss.add(when: 'CONFIG_XLNX_EFUSE_VERSAL', if_true: files(
                                                    'xlnx-versal-efuse-cache.c',
                                                    'xlnx-versal-efuse-ctrl.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_EFUSE_ZYNQMP', if_true: files(
+system_ss.add(when: 'CONFIG_XLNX_EFUSE_ZYNQMP', if_true: files(
                                                    'xlnx-zynqmp-efuse.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_BBRAM', if_true: files('xlnx-bbram.c'))
+system_ss.add(when: 'CONFIG_XLNX_BBRAM', if_true: files('xlnx-bbram.c'))
 
 specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_nvram.c'))
diff --git a/hw/pci-bridge/meson.build b/hw/pci-bridge/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/pci-bridge/meson.build
+++ b/hw/pci-bridge/meson.build
@@ -XXX,XX +XXX,XX @@ pci_ss.add(when: 'CONFIG_CXL', if_true: files('cxl_root_port.c', 'cxl_upstream.c
 # Sun4u
 pci_ss.add(when: 'CONFIG_SIMBA', if_true: files('simba.c'))
 
-softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
+system_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
 
-softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('pci_expander_bridge_stubs.c'))
+system_ss.add(when: 'CONFIG_ALL', if_true: files('pci_expander_bridge_stubs.c'))
diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/pci-host/meson.build
+++ b/hw/pci-host/meson.build
@@ -XXX,XX +XXX,XX @@ pci_ss.add(when: 'CONFIG_VERSATILE_PCI', if_true: files('versatile.c'))
 # HPPA devices
 pci_ss.add(when: 'CONFIG_DINO', if_true: files('dino.c'))
 
-softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
+system_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
 
 specific_ss.add(when: 'CONFIG_PCI_POWERNV', if_true: files(
   'pnv_phb3.c',
diff --git a/hw/pci/meson.build b/hw/pci/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/pci/meson.build
+++ b/hw/pci/meson.build
@@ -XXX,XX +XXX,XX @@ pci_ss.add(files(
 # CONFIG_PCI_EXPRESS=n.
 pci_ss.add(files('pcie.c', 'pcie_aer.c'))
 pci_ss.add(files('pcie_doe.c'))
-softmmu_ss.add(when: 'CONFIG_PCI_EXPRESS', if_true: files('pcie_port.c', 'pcie_host.c'))
-softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
+system_ss.add(when: 'CONFIG_PCI_EXPRESS', if_true: files('pcie_port.c', 'pcie_host.c'))
+system_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
 
-softmmu_ss.add(when: 'CONFIG_PCI', if_false: files('pci-stub.c'))
-softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('pci-stub.c'))
+system_ss.add(when: 'CONFIG_PCI', if_false: files('pci-stub.c'))
+system_ss.add(when: 'CONFIG_ALL', if_true: files('pci-stub.c'))
diff --git a/hw/pcmcia/meson.build b/hw/pcmcia/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/pcmcia/meson.build
+++ b/hw/pcmcia/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_PCMCIA', if_true: files('pcmcia.c'))
-softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c'))
+system_ss.add(when: 'CONFIG_PCMCIA', if_true: files('pcmcia.c'))
+system_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c'))
diff --git a/hw/rdma/meson.build b/hw/rdma/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/rdma/meson.build
+++ b/hw/rdma/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_VMW_PVRDMA', if_true: files(
+system_ss.add(when: 'CONFIG_VMW_PVRDMA', if_true: files(
   'rdma.c',
   'rdma_backend.c',
   'rdma_utils.c',
diff --git a/hw/remote/meson.build b/hw/remote/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/meson.build
+++ b/hw/remote/meson.build
@@ -XXX,XX +XXX,XX @@ remote_ss.add(when: 'CONFIG_VFIO_USER_SERVER', if_true: libvfio_user_dep)
 specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('memory.c'))
 specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('proxy-memory-listener.c'))
 
-softmmu_ss.add_all(when: 'CONFIG_MULTIPROCESS', if_true: remote_ss)
+system_ss.add_all(when: 'CONFIG_MULTIPROCESS', if_true: remote_ss)
diff --git a/hw/rtc/meson.build b/hw/rtc/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/rtc/meson.build
+++ b/hw/rtc/meson.build
@@ -XXX,XX +XXX,XX @@
 
-softmmu_ss.add(when: 'CONFIG_DS1338', if_true: files('ds1338.c'))
-softmmu_ss.add(when: 'CONFIG_M41T80', if_true: files('m41t80.c'))
-softmmu_ss.add(when: 'CONFIG_M48T59', if_true: files('m48t59.c'))
-softmmu_ss.add(when: 'CONFIG_PL031', if_true: files('pl031.c'))
-softmmu_ss.add(when: 'CONFIG_TWL92230', if_true: files('twl92230.c'))
-softmmu_ss.add(when: ['CONFIG_ISA_BUS', 'CONFIG_M48T59'], if_true: files('m48t59-isa.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-rtc.c'))
+system_ss.add(when: 'CONFIG_DS1338', if_true: files('ds1338.c'))
+system_ss.add(when: 'CONFIG_M41T80', if_true: files('m41t80.c'))
+system_ss.add(when: 'CONFIG_M48T59', if_true: files('m48t59.c'))
+system_ss.add(when: 'CONFIG_PL031', if_true: files('pl031.c'))
+system_ss.add(when: 'CONFIG_TWL92230', if_true: files('twl92230.c'))
+system_ss.add(when: ['CONFIG_ISA_BUS', 'CONFIG_M48T59'], if_true: files('m48t59-isa.c'))
+system_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-rtc.c'))
 
-softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_rtc.c'))
-softmmu_ss.add(when: 'CONFIG_SUN4V_RTC', if_true: files('sun4v-rtc.c'))
-softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_rtc.c'))
-softmmu_ss.add(when: 'CONFIG_GOLDFISH_RTC', if_true: files('goldfish_rtc.c'))
-softmmu_ss.add(when: 'CONFIG_LS7A_RTC', if_true: files('ls7a_rtc.c'))
-softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-rtc.c'))
-softmmu_ss.add(when: 'CONFIG_MC146818RTC', if_true: files('mc146818rtc.c'))
+system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_rtc.c'))
+system_ss.add(when: 'CONFIG_SUN4V_RTC', if_true: files('sun4v-rtc.c'))
+system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_rtc.c'))
+system_ss.add(when: 'CONFIG_GOLDFISH_RTC', if_true: files('goldfish_rtc.c'))
+system_ss.add(when: 'CONFIG_LS7A_RTC', if_true: files('ls7a_rtc.c'))
+system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-rtc.c'))
+system_ss.add(when: 'CONFIG_MC146818RTC', if_true: files('mc146818rtc.c'))
diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/scsi/meson.build
+++ b/hw/scsi/meson.build
@@ -XXX,XX +XXX,XX @@ scsi_ss.add(when: 'CONFIG_LSI_SCSI_PCI', if_true: files('lsi53c895a.c'))
 scsi_ss.add(when: 'CONFIG_MEGASAS_SCSI_PCI', if_true: files('megasas.c'))
 scsi_ss.add(when: 'CONFIG_MPTSAS_SCSI_PCI', if_true: files('mptsas.c', 'mptconfig.c', 'mptendian.c'))
 scsi_ss.add(when: 'CONFIG_VMW_PVSCSI_SCSI_PCI', if_true: files('vmw_pvscsi.c'))
-softmmu_ss.add_all(when: 'CONFIG_SCSI', if_true: scsi_ss)
+system_ss.add_all(when: 'CONFIG_SCSI', if_true: scsi_ss)
 
 specific_scsi_ss = ss.source_set()
 
diff --git a/hw/sd/meson.build b/hw/sd/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/sd/meson.build
+++ b/hw/sd/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_PL181', if_true: files('pl181.c'))
-softmmu_ss.add(when: 'CONFIG_SD', if_true: files('sd.c', 'core.c', 'sdmmc-internal.c'))
-softmmu_ss.add(when: 'CONFIG_SDHCI', if_true: files('sdhci.c'))
-softmmu_ss.add(when: 'CONFIG_SDHCI_PCI', if_true: files('sdhci-pci.c'))
-softmmu_ss.add(when: 'CONFIG_SSI_SD', if_true: files('ssi-sd.c'))
+system_ss.add(when: 'CONFIG_PL181', if_true: files('pl181.c'))
+system_ss.add(when: 'CONFIG_SD', if_true: files('sd.c', 'core.c', 'sdmmc-internal.c'))
+system_ss.add(when: 'CONFIG_SDHCI', if_true: files('sdhci.c'))
+system_ss.add(when: 'CONFIG_SDHCI_PCI', if_true: files('sdhci-pci.c'))
+system_ss.add(when: 'CONFIG_SSI_SD', if_true: files('ssi-sd.c'))
 
-softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_mmc.c'))
-softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_mmci.c'))
-softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_sdhost.c'))
-softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_sdhci.c'))
-softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sdhost.c'))
-softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_sdhci.c'))
-softmmu_ss.add(when: 'CONFIG_CADENCE_SDHCI', if_true: files('cadence_sdhci.c'))
+system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_mmc.c'))
+system_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_mmci.c'))
+system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_sdhost.c'))
+system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_sdhci.c'))
+system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sdhost.c'))
+system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_sdhci.c'))
+system_ss.add(when: 'CONFIG_CADENCE_SDHCI', if_true: files('cadence_sdhci.c'))
diff --git a/hw/sensor/meson.build b/hw/sensor/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/sensor/meson.build
+++ b/hw/sensor/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_TMP105', if_true: files('tmp105.c'))
-softmmu_ss.add(when: 'CONFIG_TMP421', if_true: files('tmp421.c'))
-softmmu_ss.add(when: 'CONFIG_DPS310', if_true: files('dps310.c'))
-softmmu_ss.add(when: 'CONFIG_EMC141X', if_true: files('emc141x.c'))
-softmmu_ss.add(when: 'CONFIG_ADM1272', if_true: files('adm1272.c'))
-softmmu_ss.add(when: 'CONFIG_MAX34451', if_true: files('max34451.c'))
-softmmu_ss.add(when: 'CONFIG_LSM303DLHC_MAG', if_true: files('lsm303dlhc_mag.c'))
-softmmu_ss.add(when: 'CONFIG_ISL_PMBUS_VR', if_true: files('isl_pmbus_vr.c'))
-softmmu_ss.add(when: 'CONFIG_MAX31785', if_true: files('max31785.c'))
+system_ss.add(when: 'CONFIG_TMP105', if_true: files('tmp105.c'))
+system_ss.add(when: 'CONFIG_TMP421', if_true: files('tmp421.c'))
+system_ss.add(when: 'CONFIG_DPS310', if_true: files('dps310.c'))
+system_ss.add(when: 'CONFIG_EMC141X', if_true: files('emc141x.c'))
+system_ss.add(when: 'CONFIG_ADM1272', if_true: files('adm1272.c'))
+system_ss.add(when: 'CONFIG_MAX34451', if_true: files('max34451.c'))
+system_ss.add(when: 'CONFIG_LSM303DLHC_MAG', if_true: files('lsm303dlhc_mag.c'))
+system_ss.add(when: 'CONFIG_ISL_PMBUS_VR', if_true: files('isl_pmbus_vr.c'))
+system_ss.add(when: 'CONFIG_MAX31785', if_true: files('max31785.c'))
diff --git a/hw/smbios/meson.build b/hw/smbios/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/smbios/meson.build
+++ b/hw/smbios/meson.build
@@ -XXX,XX +XXX,XX @@ smbios_ss.add(when: 'CONFIG_IPMI',
               if_true: files('smbios_type_38.c'),
               if_false: files('smbios_type_38-stub.c'))
 
-softmmu_ss.add_all(when: 'CONFIG_SMBIOS', if_true: smbios_ss)
-softmmu_ss.add(when: 'CONFIG_SMBIOS', if_false: files('smbios-stub.c'))
+system_ss.add_all(when: 'CONFIG_SMBIOS', if_true: smbios_ss)
+system_ss.add(when: 'CONFIG_SMBIOS', if_false: files('smbios-stub.c'))
 
-softmmu_ss.add(when: 'CONFIG_ALL', if_true: files(
+system_ss.add(when: 'CONFIG_ALL', if_true: files(
   'smbios-stub.c',
   'smbios_type_38-stub.c',
 ))
diff --git a/hw/ssi/meson.build b/hw/ssi/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/ssi/meson.build
+++ b/hw/ssi/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_smc.c'))
-softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-spi.c'))
-softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_fiu.c', 'npcm_pspi.c'))
-softmmu_ss.add(when: 'CONFIG_PL022', if_true: files('pl022.c'))
-softmmu_ss.add(when: 'CONFIG_SIFIVE_SPI', if_true: files('sifive_spi.c'))
-softmmu_ss.add(when: 'CONFIG_SSI', if_true: files('ssi.c'))
-softmmu_ss.add(when: 'CONFIG_STM32F2XX_SPI', if_true: files('stm32f2xx_spi.c'))
-softmmu_ss.add(when: 'CONFIG_XILINX_SPI', if_true: files('xilinx_spi.c'))
-softmmu_ss.add(when: 'CONFIG_XILINX_SPIPS', if_true: files('xilinx_spips.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-ospi.c'))
-softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_spi.c'))
-softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_spi.c'))
-softmmu_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_spi_host.c'))
+system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_smc.c'))
+system_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-spi.c'))
+system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_fiu.c', 'npcm_pspi.c'))
+system_ss.add(when: 'CONFIG_PL022', if_true: files('pl022.c'))
+system_ss.add(when: 'CONFIG_SIFIVE_SPI', if_true: files('sifive_spi.c'))
+system_ss.add(when: 'CONFIG_SSI', if_true: files('ssi.c'))
+system_ss.add(when: 'CONFIG_STM32F2XX_SPI', if_true: files('stm32f2xx_spi.c'))
+system_ss.add(when: 'CONFIG_XILINX_SPI', if_true: files('xilinx_spi.c'))
+system_ss.add(when: 'CONFIG_XILINX_SPIPS', if_true: files('xilinx_spips.c'))
+system_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-ospi.c'))
+system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_spi.c'))
+system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_spi.c'))
+system_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_spi_host.c'))
diff --git a/hw/timer/meson.build b/hw/timer/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/timer/meson.build
+++ b/hw/timer/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_A9_GTIMER', if_true: files('a9gtimer.c'))
-softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10_PIT', if_true: files('allwinner-a10-pit.c'))
-softmmu_ss.add(when: 'CONFIG_ALTERA_TIMER', if_true: files('altera_timer.c'))
-softmmu_ss.add(when: 'CONFIG_ARM_MPTIMER', if_true: files('arm_mptimer.c'))
-softmmu_ss.add(when: 'CONFIG_ARM_TIMER', if_true: files('arm_timer.c'))
-softmmu_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_systick.c'))
-softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_timer.c'))
-softmmu_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_ttc.c'))
-softmmu_ss.add(when: 'CONFIG_CMSDK_APB_DUALTIMER', if_true: files('cmsdk-apb-dualtimer.c'))
-softmmu_ss.add(when: 'CONFIG_CMSDK_APB_TIMER', if_true: files('cmsdk-apb-timer.c'))
-softmmu_ss.add(when: 'CONFIG_RENESAS_TMR', if_true: files('renesas_tmr.c'))
-softmmu_ss.add(when: 'CONFIG_RENESAS_CMT', if_true: files('renesas_cmt.c'))
-softmmu_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic-timer.c'))
-softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_timer.c'))
-softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_mct.c'))
-softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pwm.c'))
-softmmu_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_gptimer.c'))
-softmmu_ss.add(when: 'CONFIG_HPET', if_true: files('hpet.c'))
-softmmu_ss.add(when: 'CONFIG_I8254', if_true: files('i8254_common.c', 'i8254.c'))
-softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_epit.c'))
-softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpt.c'))
-softmmu_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gictimer.c'))
-softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-timer.c'))
-softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_timer.c'))
-softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_timer.c'))
-softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gptimer.c'))
-softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_synctimer.c'))
-softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_timer.c'))
-softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_systmr.c'))
-softmmu_ss.add(when: 'CONFIG_SH_TIMER', if_true: files('sh_timer.c'))
-softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_timer.c'))
-softmmu_ss.add(when: 'CONFIG_SSE_COUNTER', if_true: files('sse-counter.c'))
-softmmu_ss.add(when: 'CONFIG_SSE_TIMER', if_true: files('sse-timer.c'))
-softmmu_ss.add(when: 'CONFIG_STELLARIS_GPTM', if_true: files('stellaris-gptm.c'))
-softmmu_ss.add(when: 'CONFIG_STM32F2XX_TIMER', if_true: files('stm32f2xx_timer.c'))
-softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_timer.c'))
+system_ss.add(when: 'CONFIG_A9_GTIMER', if_true: files('a9gtimer.c'))
+system_ss.add(when: 'CONFIG_ALLWINNER_A10_PIT', if_true: files('allwinner-a10-pit.c'))
+system_ss.add(when: 'CONFIG_ALTERA_TIMER', if_true: files('altera_timer.c'))
+system_ss.add(when: 'CONFIG_ARM_MPTIMER', if_true: files('arm_mptimer.c'))
+system_ss.add(when: 'CONFIG_ARM_TIMER', if_true: files('arm_timer.c'))
+system_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_systick.c'))
+system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_timer.c'))
+system_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_ttc.c'))
+system_ss.add(when: 'CONFIG_CMSDK_APB_DUALTIMER', if_true: files('cmsdk-apb-dualtimer.c'))
+system_ss.add(when: 'CONFIG_CMSDK_APB_TIMER', if_true: files('cmsdk-apb-timer.c'))
+system_ss.add(when: 'CONFIG_RENESAS_TMR', if_true: files('renesas_tmr.c'))
+system_ss.add(when: 'CONFIG_RENESAS_CMT', if_true: files('renesas_cmt.c'))
+system_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic-timer.c'))
+system_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_timer.c'))
+system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_mct.c'))
+system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pwm.c'))
+system_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_gptimer.c'))
+system_ss.add(when: 'CONFIG_HPET', if_true: files('hpet.c'))
+system_ss.add(when: 'CONFIG_I8254', if_true: files('i8254_common.c', 'i8254.c'))
+system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_epit.c'))
+system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpt.c'))
+system_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gictimer.c'))
+system_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-timer.c'))
+system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_timer.c'))
+system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_timer.c'))
+system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gptimer.c'))
+system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_synctimer.c'))
+system_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_timer.c'))
+system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_systmr.c'))
+system_ss.add(when: 'CONFIG_SH_TIMER', if_true: files('sh_timer.c'))
+system_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_timer.c'))
+system_ss.add(when: 'CONFIG_SSE_COUNTER', if_true: files('sse-counter.c'))
+system_ss.add(when: 'CONFIG_SSE_TIMER', if_true: files('sse-timer.c'))
+system_ss.add(when: 'CONFIG_STELLARIS_GPTM', if_true: files('stellaris-gptm.c'))
+system_ss.add(when: 'CONFIG_STM32F2XX_TIMER', if_true: files('stm32f2xx_timer.c'))
+system_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_timer.c'))
 specific_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_timer.c'))
-softmmu_ss.add(when: 'CONFIG_SIFIVE_PWM', if_true: files('sifive_pwm.c'))
+system_ss.add(when: 'CONFIG_SIFIVE_PWM', if_true: files('sifive_pwm.c'))
 
 specific_ss.add(when: 'CONFIG_AVR_TIMER16', if_true: files('avr_timer16.c'))
diff --git a/hw/tpm/meson.build b/hw/tpm/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/tpm/meson.build
+++ b/hw/tpm/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_tis_common.c'))
-softmmu_ss.add(when: 'CONFIG_TPM_TIS_ISA', if_true: files('tpm_tis_isa.c'))
-softmmu_ss.add(when: 'CONFIG_TPM_TIS_SYSBUS', if_true: files('tpm_tis_sysbus.c'))
-softmmu_ss.add(when: 'CONFIG_TPM_TIS_I2C', if_true: files('tpm_tis_i2c.c'))
-softmmu_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_crb.c'))
-softmmu_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_ppi.c'))
-softmmu_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_ppi.c'))
+system_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_tis_common.c'))
+system_ss.add(when: 'CONFIG_TPM_TIS_ISA', if_true: files('tpm_tis_isa.c'))
+system_ss.add(when: 'CONFIG_TPM_TIS_SYSBUS', if_true: files('tpm_tis_sysbus.c'))
+system_ss.add(when: 'CONFIG_TPM_TIS_I2C', if_true: files('tpm_tis_i2c.c'))
+system_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_crb.c'))
+system_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_ppi.c'))
+system_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_ppi.c'))
 
 specific_ss.add(when: 'CONFIG_TPM_SPAPR', if_true: files('tpm_spapr.c'))
diff --git a/hw/usb/meson.build b/hw/usb/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/usb/meson.build
+++ b/hw/usb/meson.build
@@ -XXX,XX +XXX,XX @@
 hw_usb_modules = {}
 
 # usb subsystem core
-softmmu_ss.add(when: 'CONFIG_USB', if_true: files(
+system_ss.add(when: 'CONFIG_USB', if_true: files(
   'bus.c',
   'combined-packet.c',
   'core.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(when: 'CONFIG_USB', if_true: files(
 ))
 
 # usb host adapters
-softmmu_ss.add(when: 'CONFIG_USB_UHCI', if_true: files('hcd-uhci.c'))
-softmmu_ss.add(when: 'CONFIG_USB_OHCI', if_true: files('hcd-ohci.c'))
-softmmu_ss.add(when: 'CONFIG_USB_OHCI_PCI', if_true: files('hcd-ohci-pci.c'))
-softmmu_ss.add(when: 'CONFIG_USB_EHCI', if_true: files('hcd-ehci.c'))
-softmmu_ss.add(when: 'CONFIG_USB_EHCI_PCI', if_true: files('hcd-ehci-pci.c'))
-softmmu_ss.add(when: 'CONFIG_USB_EHCI_SYSBUS', if_true: files('hcd-ehci.c', 'hcd-ehci-sysbus.c'))
-softmmu_ss.add(when: 'CONFIG_USB_XHCI', if_true: files('hcd-xhci.c'))
-softmmu_ss.add(when: 'CONFIG_USB_XHCI_PCI', if_true: files('hcd-xhci-pci.c'))
-softmmu_ss.add(when: 'CONFIG_USB_XHCI_SYSBUS', if_true: files('hcd-xhci-sysbus.c'))
-softmmu_ss.add(when: 'CONFIG_USB_XHCI_NEC', if_true: files('hcd-xhci-nec.c'))
-softmmu_ss.add(when: 'CONFIG_USB_MUSB', if_true: files('hcd-musb.c'))
-softmmu_ss.add(when: 'CONFIG_USB_DWC2', if_true: files('hcd-dwc2.c'))
-softmmu_ss.add(when: 'CONFIG_USB_DWC3', if_true: files('hcd-dwc3.c'))
+system_ss.add(when: 'CONFIG_USB_UHCI', if_true: files('hcd-uhci.c'))
+system_ss.add(when: 'CONFIG_USB_OHCI', if_true: files('hcd-ohci.c'))
+system_ss.add(when: 'CONFIG_USB_OHCI_PCI', if_true: files('hcd-ohci-pci.c'))
+system_ss.add(when: 'CONFIG_USB_EHCI', if_true: files('hcd-ehci.c'))
+system_ss.add(when: 'CONFIG_USB_EHCI_PCI', if_true: files('hcd-ehci-pci.c'))
+system_ss.add(when: 'CONFIG_USB_EHCI_SYSBUS', if_true: files('hcd-ehci.c', 'hcd-ehci-sysbus.c'))
+system_ss.add(when: 'CONFIG_USB_XHCI', if_true: files('hcd-xhci.c'))
+system_ss.add(when: 'CONFIG_USB_XHCI_PCI', if_true: files('hcd-xhci-pci.c'))
+system_ss.add(when: 'CONFIG_USB_XHCI_SYSBUS', if_true: files('hcd-xhci-sysbus.c'))
+system_ss.add(when: 'CONFIG_USB_XHCI_NEC', if_true: files('hcd-xhci-nec.c'))
+system_ss.add(when: 'CONFIG_USB_MUSB', if_true: files('hcd-musb.c'))
+system_ss.add(when: 'CONFIG_USB_DWC2', if_true: files('hcd-dwc2.c'))
+system_ss.add(when: 'CONFIG_USB_DWC3', if_true: files('hcd-dwc3.c'))
 
-softmmu_ss.add(when: 'CONFIG_TUSB6010', if_true: files('tusb6010.c'))
-softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('chipidea.c'))
-softmmu_ss.add(when: 'CONFIG_IMX_USBPHY', if_true: files('imx-usb-phy.c'))
-softmmu_ss.add(when: 'CONFIG_VT82C686', if_true: files('vt82c686-uhci-pci.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-usb2-ctrl-regs.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_USB_SUBSYS', if_true: files('xlnx-usb-subsystem.c'))
+system_ss.add(when: 'CONFIG_TUSB6010', if_true: files('tusb6010.c'))
+system_ss.add(when: 'CONFIG_IMX', if_true: files('chipidea.c'))
+system_ss.add(when: 'CONFIG_IMX_USBPHY', if_true: files('imx-usb-phy.c'))
+system_ss.add(when: 'CONFIG_VT82C686', if_true: files('vt82c686-uhci-pci.c'))
+system_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-usb2-ctrl-regs.c'))
+system_ss.add(when: 'CONFIG_XLNX_USB_SUBSYS', if_true: files('xlnx-usb-subsystem.c'))
 
 # emulated usb devices
-softmmu_ss.add(when: 'CONFIG_USB', if_true: files('dev-hub.c'))
-softmmu_ss.add(when: 'CONFIG_USB', if_true: files('dev-hid.c'))
-softmmu_ss.add(when: 'CONFIG_USB_TABLET_WACOM', if_true: files('dev-wacom.c'))
-softmmu_ss.add(when: 'CONFIG_USB_STORAGE_CORE', if_true: files('dev-storage.c'))
-softmmu_ss.add(when: 'CONFIG_USB_STORAGE_BOT', if_true: files('dev-storage-bot.c'))
-softmmu_ss.add(when: 'CONFIG_USB_STORAGE_CLASSIC', if_true: files('dev-storage-classic.c'))
-softmmu_ss.add(when: 'CONFIG_USB_STORAGE_UAS', if_true: files('dev-uas.c'))
-softmmu_ss.add(when: 'CONFIG_USB_AUDIO', if_true: files('dev-audio.c'))
-softmmu_ss.add(when: 'CONFIG_USB_SERIAL', if_true: files('dev-serial.c'))
-softmmu_ss.add(when: 'CONFIG_USB_NETWORK', if_true: files('dev-network.c'))
-softmmu_ss.add(when: ['CONFIG_POSIX', 'CONFIG_USB_STORAGE_MTP'], if_true: files('dev-mtp.c'))
+system_ss.add(when: 'CONFIG_USB', if_true: files('dev-hub.c'))
+system_ss.add(when: 'CONFIG_USB', if_true: files('dev-hid.c'))
+system_ss.add(when: 'CONFIG_USB_TABLET_WACOM', if_true: files('dev-wacom.c'))
+system_ss.add(when: 'CONFIG_USB_STORAGE_CORE', if_true: files('dev-storage.c'))
+system_ss.add(when: 'CONFIG_USB_STORAGE_BOT', if_true: files('dev-storage-bot.c'))
+system_ss.add(when: 'CONFIG_USB_STORAGE_CLASSIC', if_true: files('dev-storage-classic.c'))
+system_ss.add(when: 'CONFIG_USB_STORAGE_UAS', if_true: files('dev-uas.c'))
+system_ss.add(when: 'CONFIG_USB_AUDIO', if_true: files('dev-audio.c'))
+system_ss.add(when: 'CONFIG_USB_SERIAL', if_true: files('dev-serial.c'))
+system_ss.add(when: 'CONFIG_USB_NETWORK', if_true: files('dev-network.c'))
+system_ss.add(when: ['CONFIG_POSIX', 'CONFIG_USB_STORAGE_MTP'], if_true: files('dev-mtp.c'))
 
 # smartcard
-softmmu_ss.add(when: 'CONFIG_USB_SMARTCARD', if_true: files('dev-smartcard-reader.c'))
+system_ss.add(when: 'CONFIG_USB_SMARTCARD', if_true: files('dev-smartcard-reader.c'))
 
 if cacard.found()
   usbsmartcard_ss = ss.source_set()
@@ -XXX,XX +XXX,XX @@ if cacard.found()
 endif
 
 # U2F
-softmmu_ss.add(when: 'CONFIG_USB_U2F', if_true: files('u2f.c'))
-softmmu_ss.add(when: ['CONFIG_LINUX', 'CONFIG_USB_U2F'], if_true: [libudev, files('u2f-passthru.c')])
+system_ss.add(when: 'CONFIG_USB_U2F', if_true: files('u2f.c'))
+system_ss.add(when: ['CONFIG_LINUX', 'CONFIG_USB_U2F'], if_true: [libudev, files('u2f-passthru.c')])
 if u2f.found()
-  softmmu_ss.add(when: 'CONFIG_USB_U2F', if_true: [u2f, files('u2f-emulated.c')])
+  system_ss.add(when: 'CONFIG_USB_U2F', if_true: [u2f, files('u2f-emulated.c')])
 endif
 
 # CanoKey
 if canokey.found()
-  softmmu_ss.add(when: 'CONFIG_USB_CANOKEY', if_true: [canokey, files('canokey.c')])
+  system_ss.add(when: 'CONFIG_USB_CANOKEY', if_true: [canokey, files('canokey.c')])
 endif
 
 # usb redirect
@@ -XXX,XX +XXX,XX @@ if libusb.found()
   hw_usb_modules += {'host': usbhost_ss}
 endif
 
-softmmu_ss.add(when: ['CONFIG_USB', 'CONFIG_XEN_BUS', libusb], if_true: files('xen-usb.c'))
+system_ss.add(when: ['CONFIG_USB', 'CONFIG_XEN_BUS', libusb], if_true: files('xen-usb.c'))
 
 modules += { 'hw-usb': hw_usb_modules }
diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/virtio/meson.build
+++ b/hw/virtio/meson.build
@@ -XXX,XX +XXX,XX @@ virtio_pci_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa-dev-pci.c'
 
 specific_virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss)
 
-softmmu_ss.add_all(when: 'CONFIG_VIRTIO', if_true: softmmu_virtio_ss)
-softmmu_ss.add(when: 'CONFIG_VIRTIO', if_false: files('vhost-stub.c'))
-softmmu_ss.add(when: 'CONFIG_VIRTIO', if_false: files('virtio-stub.c'))
-softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c'))
-softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('virtio-stub.c'))
-softmmu_ss.add(files('virtio-hmp-cmds.c'))
+system_ss.add_all(when: 'CONFIG_VIRTIO', if_true: softmmu_virtio_ss)
+system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('vhost-stub.c'))
+system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('virtio-stub.c'))
+system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c'))
+system_ss.add(when: 'CONFIG_ALL', if_true: files('virtio-stub.c'))
+system_ss.add(files('virtio-hmp-cmds.c'))
 
 specific_ss.add_all(when: 'CONFIG_VIRTIO', if_true: specific_virtio_ss)
diff --git a/hw/watchdog/meson.build b/hw/watchdog/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/watchdog/meson.build
+++ b/hw/watchdog/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(files('watchdog.c'))
-softmmu_ss.add(when: 'CONFIG_ALLWINNER_WDT', if_true: files('allwinner-wdt.c'))
-softmmu_ss.add(when: 'CONFIG_CMSDK_APB_WATCHDOG', if_true: files('cmsdk-apb-watchdog.c'))
-softmmu_ss.add(when: 'CONFIG_WDT_IB6300ESB', if_true: files('wdt_i6300esb.c'))
-softmmu_ss.add(when: 'CONFIG_WDT_IB700', if_true: files('wdt_ib700.c'))
-softmmu_ss.add(when: 'CONFIG_WDT_DIAG288', if_true: files('wdt_diag288.c'))
-softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('wdt_aspeed.c'))
-softmmu_ss.add(when: 'CONFIG_WDT_IMX2', if_true: files('wdt_imx2.c'))
-softmmu_ss.add(when: 'CONFIG_WDT_SBSA', if_true: files('sbsa_gwdt.c'))
+system_ss.add(files('watchdog.c'))
+system_ss.add(when: 'CONFIG_ALLWINNER_WDT', if_true: files('allwinner-wdt.c'))
+system_ss.add(when: 'CONFIG_CMSDK_APB_WATCHDOG', if_true: files('cmsdk-apb-watchdog.c'))
+system_ss.add(when: 'CONFIG_WDT_IB6300ESB', if_true: files('wdt_i6300esb.c'))
+system_ss.add(when: 'CONFIG_WDT_IB700', if_true: files('wdt_ib700.c'))
+system_ss.add(when: 'CONFIG_WDT_DIAG288', if_true: files('wdt_diag288.c'))
+system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('wdt_aspeed.c'))
+system_ss.add(when: 'CONFIG_WDT_IMX2', if_true: files('wdt_imx2.c'))
+system_ss.add(when: 'CONFIG_WDT_SBSA', if_true: files('sbsa_gwdt.c'))
 specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_watchdog.c'))
diff --git a/hw/xen/meson.build b/hw/xen/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/xen/meson.build
+++ b/hw/xen/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: ['CONFIG_XEN_BUS'], if_true: files(
+system_ss.add(when: ['CONFIG_XEN_BUS'], if_true: files(
   'xen-backend.c',
   'xen-bus-helper.c',
   'xen-bus.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(when: ['CONFIG_XEN_BUS'], if_true: files(
   'xen_pvdev.c',
 ))
 
-softmmu_ss.add(when: ['CONFIG_XEN', xen], if_true: files(
+system_ss.add(when: ['CONFIG_XEN', xen], if_true: files(
   'xen-operations.c',
 ))
 
diff --git a/migration/meson.build b/migration/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/migration/meson.build
+++ b/migration/meson.build
@@ -XXX,XX +XXX,XX @@ migration_files = files(
   'yank_functions.c',
 )
 
-softmmu_ss.add(files(
+system_ss.add(files(
   'block-dirty-bitmap.c',
   'channel.c',
   'channel-block.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(files(
 ), gnutls)
 
 if get_option('replication').allowed()
-  softmmu_ss.add(files('colo-failover.c', 'colo.c'))
+  system_ss.add(files('colo-failover.c', 'colo.c'))
 endif
 
-softmmu_ss.add(when: rdma, if_true: files('rdma.c'))
+system_ss.add(when: rdma, if_true: files('rdma.c'))
 if get_option('live_block_migration').allowed()
-  softmmu_ss.add(files('block.c'))
+  system_ss.add(files('block.c'))
 endif
-softmmu_ss.add(when: zstd, if_true: files('multifd-zstd.c'))
+system_ss.add(when: zstd, if_true: files('multifd-zstd.c'))
 
 specific_ss.add(when: 'CONFIG_SYSTEM_ONLY',
                 if_true: files('ram.c',
diff --git a/monitor/meson.build b/monitor/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/monitor/meson.build
+++ b/monitor/meson.build
@@ -XXX,XX +XXX,XX @@
 qmp_ss.add(files('monitor.c', 'qmp.c', 'qmp-cmds-control.c'))
 
-softmmu_ss.add(files(
+system_ss.add(files(
   'fds.c',
   'hmp-cmds.c',
   'hmp.c',
 ))
-softmmu_ss.add([spice_headers, files('qmp-cmds.c')])
+system_ss.add([spice_headers, files('qmp-cmds.c')])
 
 specific_ss.add(when: 'CONFIG_SYSTEM_ONLY',
 		if_true: [files( 'hmp-cmds-target.c', 'hmp-target.c'), spice])
diff --git a/net/can/meson.build b/net/can/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/net/can/meson.build
+++ b/net/can/meson.build
@@ -XXX,XX +XXX,XX @@ can_ss = ss.source_set()
 can_ss.add(files('can_core.c', 'can_host.c'))
 can_ss.add(when: 'CONFIG_LINUX', if_true: files('can_socketcan.c'))
 
-softmmu_ss.add_all(when: 'CONFIG_CAN_BUS', if_true: can_ss)
+system_ss.add_all(when: 'CONFIG_CAN_BUS', if_true: can_ss)
diff --git a/net/meson.build b/net/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/net/meson.build
+++ b/net/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(files(
+system_ss.add(files(
   'announce.c',
   'checksum.c',
   'dump.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(files(
 
 if get_option('replication').allowed() or \
     get_option('colo_proxy').allowed()
-  softmmu_ss.add(files('colo-compare.c'))
-  softmmu_ss.add(files('colo.c'))
+  system_ss.add(files('colo-compare.c'))
+  system_ss.add(files('colo.c'))
 endif
 
 if get_option('colo_proxy').allowed()
-  softmmu_ss.add(files('filter-rewriter.c'))
+  system_ss.add(files('filter-rewriter.c'))
 endif
 
-softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('filter-replay.c'))
+system_ss.add(when: 'CONFIG_TCG', if_true: files('filter-replay.c'))
 
 if have_l2tpv3
-  softmmu_ss.add(files('l2tpv3.c'))
+  system_ss.add(files('l2tpv3.c'))
 endif
-softmmu_ss.add(when: slirp, if_true: files('slirp.c'))
-softmmu_ss.add(when: vde, if_true: files('vde.c'))
+system_ss.add(when: slirp, if_true: files('slirp.c'))
+system_ss.add(when: vde, if_true: files('vde.c'))
 if have_netmap
-  softmmu_ss.add(files('netmap.c'))
+  system_ss.add(files('netmap.c'))
 endif
 if have_vhost_net_user
-  softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-user.c'), if_false: files('vhost-user-stub.c'))
-  softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-user-stub.c'))
+  system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-user.c'), if_false: files('vhost-user-stub.c'))
+  system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-user-stub.c'))
 endif
 
-softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('tap-linux.c'))
-softmmu_ss.add(when: 'CONFIG_BSD', if_true: files('tap-bsd.c'))
-softmmu_ss.add(when: 'CONFIG_SOLARIS', if_true: files('tap-solaris.c'))
+system_ss.add(when: 'CONFIG_LINUX', if_true: files('tap-linux.c'))
+system_ss.add(when: 'CONFIG_BSD', if_true: files('tap-bsd.c'))
+system_ss.add(when: 'CONFIG_SOLARIS', if_true: files('tap-solaris.c'))
 tap_posix = ['tap.c']
 if not config_host.has_key('CONFIG_LINUX') and not config_host.has_key('CONFIG_BSD') and not config_host.has_key('CONFIG_SOLARIS')
   tap_posix += 'tap-stub.c'
 endif
-softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files(tap_posix))
-softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('tap-win32.c'))
+system_ss.add(when: 'CONFIG_POSIX', if_true: files(tap_posix))
+system_ss.add(when: 'CONFIG_WIN32', if_true: files('tap-win32.c'))
 if have_vhost_net_vdpa
-  softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-vdpa.c'), if_false: files('vhost-vdpa-stub.c'))
-  softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-vdpa-stub.c'))
+  system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-vdpa.c'), if_false: files('vhost-vdpa-stub.c'))
+  system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-vdpa-stub.c'))
 endif
 
 vmnet_files = files(
@@ -XXX,XX +XXX,XX @@ vmnet_files = files(
   'vmnet-host.c',
   'vmnet-shared.c'
 )
-softmmu_ss.add(when: vmnet, if_true: vmnet_files)
+system_ss.add(when: vmnet, if_true: vmnet_files)
 subdir('can')
diff --git a/qom/meson.build b/qom/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/qom/meson.build
+++ b/qom/meson.build
@@ -XXX,XX +XXX,XX @@ qom_ss.add(files(
 ))
 
 qmp_ss.add(files('qom-qmp-cmds.c'))
-softmmu_ss.add(files('qom-hmp-cmds.c'))
+system_ss.add(files('qom-hmp-cmds.c'))
diff --git a/replay/meson.build b/replay/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/replay/meson.build
+++ b/replay/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(when: 'CONFIG_TCG', if_true: files(
+system_ss.add(when: 'CONFIG_TCG', if_true: files(
   'replay.c',
   'replay-internal.c',
   'replay-events.c',
diff --git a/softmmu/meson.build b/softmmu/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/softmmu/meson.build
+++ b/softmmu/meson.build
@@ -XXX,XX +XXX,XX @@ specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: [files(
   'icount.c',
 )])
 
-softmmu_ss.add(files(
+system_ss.add(files(
   'balloon.c',
   'bootdevice.c',
   'cpus.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(files(
 ), sdl, libpmem, libdaxctl)
 
 if have_tpm
-  softmmu_ss.add(files('tpm.c'))
+  system_ss.add(files('tpm.c'))
 endif
 
-softmmu_ss.add(when: seccomp, if_true: files('qemu-seccomp.c'))
-softmmu_ss.add(when: fdt, if_true: files('device_tree.c'))
+system_ss.add(when: seccomp, if_true: files('qemu-seccomp.c'))
+system_ss.add(when: fdt, if_true: files('device_tree.c'))
diff --git a/stats/meson.build b/stats/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/stats/meson.build
+++ b/stats/meson.build
@@ -1 +1 @@
-softmmu_ss.add(files('stats-hmp-cmds.c', 'stats-qmp-cmds.c'))
+system_ss.add(files('stats-hmp-cmds.c', 'stats-qmp-cmds.c'))
diff --git a/target/alpha/meson.build b/target/alpha/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/alpha/meson.build
+++ b/target/alpha/meson.build
@@ -XXX,XX +XXX,XX @@ alpha_ss.add(files(
   'vax_helper.c',
 ))
 
-alpha_softmmu_ss = ss.source_set()
-alpha_softmmu_ss.add(files('machine.c'))
+alpha_system_ss = ss.source_set()
+alpha_system_ss.add(files('machine.c'))
 
 target_arch += {'alpha': alpha_ss}
-target_softmmu_arch += {'alpha': alpha_softmmu_ss}
+target_softmmu_arch += {'alpha': alpha_system_ss}
diff --git a/target/arm/hvf/meson.build b/target/arm/hvf/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/hvf/meson.build
+++ b/target/arm/hvf/meson.build
@@ -XXX,XX +XXX,XX @@
-arm_softmmu_ss.add(when: [hvf, 'CONFIG_HVF'], if_true: files(
+arm_system_ss.add(when: [hvf, 'CONFIG_HVF'], if_true: files(
   'hvf.c',
 ))
diff --git a/target/arm/meson.build b/target/arm/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -XXX,XX +XXX,XX @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
   'gdbstub64.c',
 ))
 
-arm_softmmu_ss = ss.source_set()
-arm_softmmu_ss.add(files(
+arm_system_ss = ss.source_set()
+arm_system_ss.add(files(
   'arch_dump.c',
   'arm-powerctl.c',
   'arm-qmp-cmds.c',
@@ -XXX,XX +XXX,XX @@ else
 endif
 
 target_arch += {'arm': arm_ss}
-target_softmmu_arch += {'arm': arm_softmmu_ss}
+target_softmmu_arch += {'arm': arm_system_ss}
diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/tcg/meson.build
+++ b/target/arm/tcg/meson.build
@@ -XXX,XX +XXX,XX @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
   'sve_helper.c',
 ))
 
-arm_softmmu_ss.add(files(
+arm_system_ss.add(files(
   'psci.c',
 ))
diff --git a/target/avr/meson.build b/target/avr/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/avr/meson.build
+++ b/target/avr/meson.build
@@ -XXX,XX +XXX,XX @@ gen = [
 ]
 
 avr_ss = ss.source_set()
-avr_softmmu_ss = ss.source_set()
+avr_system_ss = ss.source_set()
 
 avr_ss.add(gen)
 avr_ss.add(files(
@@ -XXX,XX +XXX,XX @@ avr_ss.add(files(
   'gdbstub.c',
   'disas.c'))
 
-avr_softmmu_ss.add(files('machine.c'))
+avr_system_ss.add(files('machine.c'))
 
 target_arch += {'avr': avr_ss}
-target_softmmu_arch += {'avr': avr_softmmu_ss}
+target_softmmu_arch += {'avr': avr_system_ss}
diff --git a/target/cris/meson.build b/target/cris/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/cris/meson.build
+++ b/target/cris/meson.build
@@ -XXX,XX +XXX,XX @@ cris_ss.add(files(
   'translate.c',
 ))
 
-cris_softmmu_ss = ss.source_set()
-cris_softmmu_ss.add(files(
+cris_system_ss = ss.source_set()
+cris_system_ss.add(files(
   'helper.c',
   'machine.c',
   'mmu.c',
 ))
 
 target_arch += {'cris': cris_ss}
-target_softmmu_arch += {'cris': cris_softmmu_ss}
+target_softmmu_arch += {'cris': cris_system_ss}
diff --git a/target/hppa/meson.build b/target/hppa/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/hppa/meson.build
+++ b/target/hppa/meson.build
@@ -XXX,XX +XXX,XX @@ hppa_ss.add(files(
   'translate.c',
 ))
 
-hppa_softmmu_ss = ss.source_set()
-hppa_softmmu_ss.add(files(
+hppa_system_ss = ss.source_set()
+hppa_system_ss.add(files(
   'int_helper.c',
   'machine.c',
   'mem_helper.c',
@@ -XXX,XX +XXX,XX @@ hppa_softmmu_ss.add(files(
 ))
 
 target_arch += {'hppa': hppa_ss}
-target_softmmu_arch += {'hppa': hppa_softmmu_ss}
+target_softmmu_arch += {'hppa': hppa_system_ss}
diff --git a/target/i386/hax/meson.build b/target/i386/hax/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/i386/hax/meson.build
+++ b/target/i386/hax/meson.build
@@ -XXX,XX +XXX,XX @@
-i386_softmmu_ss.add(when: 'CONFIG_HAX', if_true: files(
+i386_system_ss.add(when: 'CONFIG_HAX', if_true: files(
   'hax-all.c',
   'hax-mem.c',
   'hax-accel-ops.c',
 ))
-i386_softmmu_ss.add(when: ['CONFIG_HAX', 'CONFIG_POSIX'], if_true: files('hax-posix.c'))
-i386_softmmu_ss.add(when: ['CONFIG_HAX', 'CONFIG_WIN32'], if_true: files('hax-windows.c'))
+i386_system_ss.add(when: ['CONFIG_HAX', 'CONFIG_POSIX'], if_true: files('hax-posix.c'))
+i386_system_ss.add(when: ['CONFIG_HAX', 'CONFIG_WIN32'], if_true: files('hax-windows.c'))
diff --git a/target/i386/hvf/meson.build b/target/i386/hvf/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/i386/hvf/meson.build
+++ b/target/i386/hvf/meson.build
@@ -XXX,XX +XXX,XX @@
-i386_softmmu_ss.add(when: [hvf, 'CONFIG_HVF'], if_true: files(
+i386_system_ss.add(when: [hvf, 'CONFIG_HVF'], if_true: files(
   'hvf.c',
   'x86.c',
   'x86_cpuid.c',
diff --git a/target/i386/kvm/meson.build b/target/i386/kvm/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/i386/kvm/meson.build
+++ b/target/i386/kvm/meson.build
@@ -XXX,XX +XXX,XX @@ i386_softmmu_kvm_ss.add(when: 'CONFIG_XEN_EMU', if_true: files('xen-emu.c'))
 
 i386_softmmu_kvm_ss.add(when: 'CONFIG_SEV', if_false: files('sev-stub.c'))
 
-i386_softmmu_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c'), if_false: files('hyperv-stub.c'))
+i386_system_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c'), if_false: files('hyperv-stub.c'))
 
-i386_softmmu_ss.add_all(when: 'CONFIG_KVM', if_true: i386_softmmu_kvm_ss)
+i386_system_ss.add_all(when: 'CONFIG_KVM', if_true: i386_softmmu_kvm_ss)
diff --git a/target/i386/meson.build b/target/i386/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/i386/meson.build
+++ b/target/i386/meson.build
@@ -XXX,XX +XXX,XX @@ i386_ss.add(when: 'CONFIG_SEV', if_true: files('host-cpu.c'))
 i386_ss.add(when: 'CONFIG_KVM', if_true: files('host-cpu.c'))
 i386_ss.add(when: 'CONFIG_HVF', if_true: files('host-cpu.c'))
 
-i386_softmmu_ss = ss.source_set()
-i386_softmmu_ss.add(files(
+i386_system_ss = ss.source_set()
+i386_system_ss.add(files(
   'arch_dump.c',
   'arch_memory_mapping.c',
   'machine.c',
   'monitor.c',
   'cpu-sysemu.c',
 ))
-i386_softmmu_ss.add(when: 'CONFIG_SEV', if_true: files('sev.c'), if_false: files('sev-sysemu-stub.c'))
+i386_system_ss.add(when: 'CONFIG_SEV', if_true: files('sev.c'), if_false: files('sev-sysemu-stub.c'))
 
 i386_user_ss = ss.source_set()
 
@@ -XXX,XX +XXX,XX @@ subdir('hvf')
 subdir('tcg')
 
 target_arch += {'i386': i386_ss}
-target_softmmu_arch += {'i386': i386_softmmu_ss}
+target_softmmu_arch += {'i386': i386_system_ss}
 target_user_arch += {'i386': i386_user_ss}
diff --git a/target/i386/nvmm/meson.build b/target/i386/nvmm/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/i386/nvmm/meson.build
+++ b/target/i386/nvmm/meson.build
@@ -XXX,XX +XXX,XX @@
-i386_softmmu_ss.add(when: 'CONFIG_NVMM', if_true:
+i386_system_ss.add(when: 'CONFIG_NVMM', if_true:
   files(
   'nvmm-all.c',
   'nvmm-accel-ops.c',
   )
 )
 
-i386_softmmu_ss.add(when: 'CONFIG_NVMM', if_true: nvmm)
+i386_system_ss.add(when: 'CONFIG_NVMM', if_true: nvmm)
diff --git a/target/i386/tcg/sysemu/meson.build b/target/i386/tcg/sysemu/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/i386/tcg/sysemu/meson.build
+++ b/target/i386/tcg/sysemu/meson.build
@@ -XXX,XX +XXX,XX @@
-i386_softmmu_ss.add(when: ['CONFIG_TCG', 'CONFIG_SYSTEM_ONLY'], if_true: files(
+i386_system_ss.add(when: ['CONFIG_TCG', 'CONFIG_SYSTEM_ONLY'], if_true: files(
   'tcg-cpu.c',
   'smm_helper.c',
   'excp_helper.c',
diff --git a/target/i386/whpx/meson.build b/target/i386/whpx/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/i386/whpx/meson.build
+++ b/target/i386/whpx/meson.build
@@ -XXX,XX +XXX,XX @@
-i386_softmmu_ss.add(when: 'CONFIG_WHPX', if_true: files(
+i386_system_ss.add(when: 'CONFIG_WHPX', if_true: files(
   'whpx-all.c',
   'whpx-apic.c',
   'whpx-accel-ops.c',
diff --git a/target/loongarch/meson.build b/target/loongarch/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/loongarch/meson.build
+++ b/target/loongarch/meson.build
@@ -XXX,XX +XXX,XX @@ loongarch_tcg_ss.add(files(
 ))
 loongarch_tcg_ss.add(zlib)
 
-loongarch_softmmu_ss = ss.source_set()
-loongarch_softmmu_ss.add(files(
+loongarch_system_ss = ss.source_set()
+loongarch_system_ss.add(files(
   'loongarch-qmp-cmds.c',
   'machine.c',
   'tlb_helper.c',
@@ -XXX,XX +XXX,XX @@ common_ss.add(when: 'CONFIG_LOONGARCH_DIS', if_true: [files('disas.c'), gen])
 loongarch_ss.add_all(when: 'CONFIG_TCG', if_true: [loongarch_tcg_ss])
 
 target_arch += {'loongarch': loongarch_ss}
-target_softmmu_arch += {'loongarch': loongarch_softmmu_ss}
+target_softmmu_arch += {'loongarch': loongarch_system_ss}
diff --git a/target/m68k/meson.build b/target/m68k/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/m68k/meson.build
+++ b/target/m68k/meson.build
@@ -XXX,XX +XXX,XX @@ m68k_ss.add(files(
   'translate.c',
 ))
 
-m68k_softmmu_ss = ss.source_set()
-m68k_softmmu_ss.add(files(
+m68k_system_ss = ss.source_set()
+m68k_system_ss.add(files(
   'm68k-semi.c',
   'monitor.c'
 ))
 
 target_arch += {'m68k': m68k_ss}
-target_softmmu_arch += {'m68k': m68k_softmmu_ss}
+target_softmmu_arch += {'m68k': m68k_system_ss}
diff --git a/target/microblaze/meson.build b/target/microblaze/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/microblaze/meson.build
+++ b/target/microblaze/meson.build
@@ -XXX,XX +XXX,XX @@ microblaze_ss.add(files(
   'translate.c',
 ))
 
-microblaze_softmmu_ss = ss.source_set()
-microblaze_softmmu_ss.add(files(
+microblaze_system_ss = ss.source_set()
+microblaze_system_ss.add(files(
   'mmu.c',
   'machine.c',
 ))
 
 target_arch += {'microblaze': microblaze_ss}
-target_softmmu_arch += {'microblaze': microblaze_softmmu_ss}
+target_softmmu_arch += {'microblaze': microblaze_system_ss}
diff --git a/target/mips/meson.build b/target/mips/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/mips/meson.build
+++ b/target/mips/meson.build
@@ -XXX,XX +XXX,XX @@
 mips_user_ss = ss.source_set()
-mips_softmmu_ss = ss.source_set()
+mips_system_ss = ss.source_set()
 mips_ss = ss.source_set()
 mips_ss.add(files(
   'cpu.c',
@@ -XXX,XX +XXX,XX @@ endif
 mips_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'))
 
 target_arch += {'mips': mips_ss}
-target_softmmu_arch += {'mips': mips_softmmu_ss}
+target_softmmu_arch += {'mips': mips_system_ss}
 target_user_arch += {'mips': mips_user_ss}
diff --git a/target/mips/sysemu/meson.build b/target/mips/sysemu/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/mips/sysemu/meson.build
+++ b/target/mips/sysemu/meson.build
@@ -XXX,XX +XXX,XX @@
-mips_softmmu_ss.add(files(
+mips_system_ss.add(files(
   'addr.c',
   'cp0.c',
   'cp0_timer.c',
diff --git a/target/mips/tcg/sysemu/meson.build b/target/mips/tcg/sysemu/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/mips/tcg/sysemu/meson.build
+++ b/target/mips/tcg/sysemu/meson.build
@@ -XXX,XX +XXX,XX @@
-mips_softmmu_ss.add(files(
+mips_system_ss.add(files(
   'cp0_helper.c',
   'mips-semi.c',
   'special_helper.c',
diff --git a/target/nios2/meson.build b/target/nios2/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/nios2/meson.build
+++ b/target/nios2/meson.build
@@ -XXX,XX +XXX,XX @@ nios2_ss.add(files(
   'translate.c',
 ))
 
-nios2_softmmu_ss = ss.source_set()
-nios2_softmmu_ss.add(files(
+nios2_system_ss = ss.source_set()
+nios2_system_ss.add(files(
   'helper.c',
   'monitor.c',
   'mmu.c',
@@ -XXX,XX +XXX,XX @@ nios2_softmmu_ss.add(files(
 ))
 
 target_arch += {'nios2': nios2_ss}
-target_softmmu_arch += {'nios2': nios2_softmmu_ss}
+target_softmmu_arch += {'nios2': nios2_system_ss}
diff --git a/target/openrisc/meson.build b/target/openrisc/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/openrisc/meson.build
+++ b/target/openrisc/meson.build
@@ -XXX,XX +XXX,XX @@ openrisc_ss.add(files(
   'translate.c',
 ))
 
-openrisc_softmmu_ss = ss.source_set()
-openrisc_softmmu_ss.add(files(
+openrisc_system_ss = ss.source_set()
+openrisc_system_ss.add(files(
   'interrupt.c',
   'machine.c',
   'mmu.c',
 ))
 
 target_arch += {'openrisc': openrisc_ss}
-target_softmmu_arch += {'openrisc': openrisc_softmmu_ss}
+target_softmmu_arch += {'openrisc': openrisc_system_ss}
diff --git a/target/ppc/meson.build b/target/ppc/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/ppc/meson.build
+++ b/target/ppc/meson.build
@@ -XXX,XX +XXX,XX @@ ppc_ss.add(gen)
 ppc_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('kvm-stub.c'))
 ppc_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user_only_helper.c'))
 
-ppc_softmmu_ss = ss.source_set()
-ppc_softmmu_ss.add(files(
+ppc_system_ss = ss.source_set()
+ppc_system_ss.add(files(
   'arch_dump.c',
   'machine.c',
   'mmu-hash32.c',
   'mmu_common.c',
   'ppc-qmp-cmds.c',
 ))
-ppc_softmmu_ss.add(when: 'CONFIG_TCG', if_true: files(
+ppc_system_ss.add(when: 'CONFIG_TCG', if_true: files(
   'mmu_helper.c',
 ), if_false: files(
   'tcg-stub.c',
 ))
 
-ppc_softmmu_ss.add(when: 'TARGET_PPC64', if_true: files(
+ppc_system_ss.add(when: 'TARGET_PPC64', if_true: files(
   'compat.c',
   'mmu-book3s-v3.c',
   'mmu-hash64.c',
@@ -XXX,XX +XXX,XX @@ ppc_softmmu_ss.add(when: 'TARGET_PPC64', if_true: files(
 ))
 
 target_arch += {'ppc': ppc_ss}
-target_softmmu_arch += {'ppc': ppc_softmmu_ss}
+target_softmmu_arch += {'ppc': ppc_system_ss}
diff --git a/target/riscv/meson.build b/target/riscv/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/riscv/meson.build
+++ b/target/riscv/meson.build
@@ -XXX,XX +XXX,XX @@ riscv_ss.add(files(
 ))
 riscv_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('kvm-stub.c'))
 
-riscv_softmmu_ss = ss.source_set()
-riscv_softmmu_ss.add(files(
+riscv_system_ss = ss.source_set()
+riscv_system_ss.add(files(
   'arch_dump.c',
   'pmp.c',
   'debug.c',
@@ -XXX,XX +XXX,XX @@ riscv_softmmu_ss.add(files(
 ))
 
 target_arch += {'riscv': riscv_ss}
-target_softmmu_arch += {'riscv': riscv_softmmu_ss}
+target_softmmu_arch += {'riscv': riscv_system_ss}
diff --git a/target/s390x/kvm/meson.build b/target/s390x/kvm/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/s390x/kvm/meson.build
+++ b/target/s390x/kvm/meson.build
@@ -XXX,XX +XXX,XX @@ s390x_ss.add(when: 'CONFIG_KVM', if_true: files(
 #  - KVM is enabled
 #  - the linker supports --s390-pgste
 if host_machine.cpu_family() == 's390x' and cc.has_link_argument('-Wl,--s390-pgste')
-  s390x_softmmu_ss.add(when: 'CONFIG_KVM',
+  s390x_system_ss.add(when: 'CONFIG_KVM',
                        if_true: declare_dependency(link_args: ['-Wl,--s390-pgste']))
 endif
diff --git a/target/s390x/meson.build b/target/s390x/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/s390x/meson.build
+++ b/target/s390x/meson.build
@@ -XXX,XX +XXX,XX @@ gen_features_h = custom_target('gen-features.h',
 
 s390x_ss.add(gen_features_h)
 
-s390x_softmmu_ss = ss.source_set()
-s390x_softmmu_ss.add(files(
+s390x_system_ss = ss.source_set()
+s390x_system_ss.add(files(
   'helper.c',
   'arch_dump.c',
   'diag.c',
@@ -XXX,XX +XXX,XX @@ subdir('tcg')
 subdir('kvm')
 
 target_arch += {'s390x': s390x_ss}
-target_softmmu_arch += {'s390x': s390x_softmmu_ss}
+target_softmmu_arch += {'s390x': s390x_system_ss}
 target_user_arch += {'s390x': s390x_user_ss}
diff --git a/target/sh4/meson.build b/target/sh4/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/sh4/meson.build
+++ b/target/sh4/meson.build
@@ -XXX,XX +XXX,XX @@ sh4_ss.add(files(
   'translate.c',
 ))
 
-sh4_softmmu_ss = ss.source_set()
-sh4_softmmu_ss.add(files('monitor.c'))
+sh4_system_ss = ss.source_set()
+sh4_system_ss.add(files('monitor.c'))
 
 target_arch += {'sh4': sh4_ss}
-target_softmmu_arch += {'sh4': sh4_softmmu_ss}
+target_softmmu_arch += {'sh4': sh4_system_ss}
diff --git a/target/sparc/meson.build b/target/sparc/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/sparc/meson.build
+++ b/target/sparc/meson.build
@@ -XXX,XX +XXX,XX @@ sparc_ss.add(files(
 sparc_ss.add(when: 'TARGET_SPARC', if_true: files('int32_helper.c'))
 sparc_ss.add(when: 'TARGET_SPARC64', if_true: files('int64_helper.c', 'vis_helper.c'))
 
-sparc_softmmu_ss = ss.source_set()
-sparc_softmmu_ss.add(files(
+sparc_system_ss = ss.source_set()
+sparc_system_ss.add(files(
   'machine.c',
   'mmu_helper.c',
   'monitor.c',
 ))
 
 target_arch += {'sparc': sparc_ss}
-target_softmmu_arch += {'sparc': sparc_softmmu_ss}
+target_softmmu_arch += {'sparc': sparc_system_ss}
diff --git a/target/tricore/meson.build b/target/tricore/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/tricore/meson.build
+++ b/target/tricore/meson.build
@@ -XXX,XX +XXX,XX @@ tricore_ss.add(files(
 ))
 tricore_ss.add(zlib)
 
-tricore_softmmu_ss = ss.source_set()
+tricore_system_ss = ss.source_set()
 
 target_arch += {'tricore': tricore_ss}
-target_softmmu_arch += {'tricore': tricore_softmmu_ss}
+target_softmmu_arch += {'tricore': tricore_system_ss}
diff --git a/target/xtensa/meson.build b/target/xtensa/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/target/xtensa/meson.build
+++ b/target/xtensa/meson.build
@@ -XXX,XX +XXX,XX @@ xtensa_ss.add(files(
   'xtensa-isa.c',
 ))
 
-xtensa_softmmu_ss = ss.source_set()
-xtensa_softmmu_ss.add(files(
+xtensa_system_ss = ss.source_set()
+xtensa_system_ss.add(files(
   'dbg_helper.c',
   'mmu_helper.c',
   'monitor.c',
@@ -XXX,XX +XXX,XX @@ xtensa_softmmu_ss.add(files(
 ))
 
 target_arch += {'xtensa': xtensa_ss}
-target_softmmu_arch += {'xtensa': xtensa_softmmu_ss}
+target_softmmu_arch += {'xtensa': xtensa_system_ss}
diff --git a/tcg/meson.build b/tcg/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/tcg/meson.build
+++ b/tcg/meson.build
@@ -XXX,XX +XXX,XX @@ libtcg_softmmu = static_library('tcg_softmmu',
 
 tcg_softmmu = declare_dependency(link_with: libtcg_softmmu,
                                  dependencies: tcg_ss.dependencies())
-softmmu_ss.add(tcg_softmmu)
+system_ss.add(tcg_softmmu)
diff --git a/trace/meson.build b/trace/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(files('trace-hmp-cmds.c'))
+system_ss.add(files('trace-hmp-cmds.c'))
 
 specific_ss.add(files('control-target.c'))
 
diff --git a/ui/meson.build b/ui/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -XXX,XX +XXX,XX @@
-softmmu_ss.add(pixman)
+system_ss.add(pixman)
 specific_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: pixman)   # for the include path
 specific_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: opengl)   # for the include path
 
-softmmu_ss.add(png)
-softmmu_ss.add(files(
+system_ss.add(png)
+system_ss.add(files(
   'clipboard.c',
   'console.c',
   'cursor.c',
@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(files(
   'util.c',
 ))
 if dbus_display
-  softmmu_ss.add(files('dbus-module.c'))
+  system_ss.add(files('dbus-module.c'))
 endif
-softmmu_ss.add([spice_headers, files('spice-module.c')])
-softmmu_ss.add(when: spice_protocol, if_true: files('vdagent.c'))
+system_ss.add([spice_headers, files('spice-module.c')])
+system_ss.add(when: spice_protocol, if_true: files('vdagent.c'))
 
-softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files(
+system_ss.add(when: 'CONFIG_LINUX', if_true: files(
   'input-linux.c',
   'udmabuf.c',
 ))
-softmmu_ss.add(when: cocoa, if_true: files('cocoa.m'))
+system_ss.add(when: cocoa, if_true: files('cocoa.m'))
 
 vnc_ss = ss.source_set()
 vnc_ss.add(files(
@@ -XXX,XX +XXX,XX @@ vnc_ss.add(files(
 ))
 vnc_ss.add(zlib, jpeg, gnutls)
 vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c'))
-softmmu_ss.add_all(when: vnc, if_true: vnc_ss)
-softmmu_ss.add(when: vnc, if_false: files('vnc-stubs.c'))
+system_ss.add_all(when: vnc, if_true: vnc_ss)
+system_ss.add(when: vnc, if_false: files('vnc-stubs.c'))
 
 ui_modules = {}
 
@@ -XXX,XX +XXX,XX @@ if curses.found()
   ui_modules += {'curses' : curses_ss}
 endif
 
-softmmu_ss.add(opengl)
+system_ss.add(opengl)
 if opengl.found()
   opengl_ss = ss.source_set()
   opengl_ss.add(gbm)
@@ -XXX,XX +XXX,XX @@ if dbus_display
 endif
 
 if gtk.found()
-  softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c'))
+  system_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c'))
 
   gtk_ss = ss.source_set()
   gtk_ss.add(gtk, vte, pixman, files('gtk.c'))
@@ -XXX,XX +XXX,XX @@ if gtk.found()
 endif
 
 if sdl.found()
-  softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c'))
+  system_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c'))
 
   sdl_ss = ss.source_set()
   sdl_ss.add(sdl, sdl_image, pixman, glib, files(
-- 
2.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

We want to check the softmmu tlb availability, not
if we are targetting system emulation. Besides, this
code could be used by user emulation in the future.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230605230216.17202-1-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 include/exec/cpu-defs.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h
index XXXXXXX..XXXXXXX 100644
--- a/include/exec/cpu-defs.h
+++ b/include/exec/cpu-defs.h
@@ -XXX,XX +XXX,XX @@
  */
 #define NB_MMU_MODES 16
 
-#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG)
+#if defined(CONFIG_SOFTMMU) && defined(CONFIG_TCG)
 #include "exec/tlb-common.h"
 
 /* use a fully associative victim tlb of 8 entries */
@@ -XXX,XX +XXX,XX @@
 #  endif
 # endif
 
-#endif  /* !CONFIG_USER_ONLY && CONFIG_TCG */
+#endif /* CONFIG_SOFTMMU && CONFIG_TCG */
 
-#if !defined(CONFIG_USER_ONLY)
+#if defined(CONFIG_SOFTMMU)
 /*
  * The full TLB entry, which is not accessed by generated TCG code,
  * so the layout is not as critical as that of CPUTLBEntry. This is
@@ -XXX,XX +XXX,XX @@ typedef struct CPUTLBEntryFull {
     TARGET_PAGE_ENTRY_EXTRA
 #endif
 } CPUTLBEntryFull;
-#endif  /* !CONFIG_USER_ONLY */
+#endif /* CONFIG_SOFTMMU */
 
-#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG)
+#if defined(CONFIG_SOFTMMU) && defined(CONFIG_TCG)
 /*
  * Data elements that are per MMU mode, minus the bits accessed by
  * the TCG fast path.
@@ -XXX,XX +XXX,XX @@ typedef struct CPUTLB {
 
 typedef struct CPUTLB { } CPUTLB;
 
-#endif  /* !CONFIG_USER_ONLY && CONFIG_TCG */
+#endif /* CONFIG_SOFTMMU && CONFIG_TCG */
 
 /*
  * This structure must be placed in ArchCPU immediately
-- 
2.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Commit 2f3a57ee47 ("cputlb: ensure we save the IOTLB data in
case of reset") added the SavedIOTLB structure -- which is
system emulation specific -- in the generic CPUState structure.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221216215519.5522-3-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 include/hw/core/cpu.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -XXX,XX +XXX,XX @@ struct CPUWatchpoint {
     QTAILQ_ENTRY(CPUWatchpoint) entry;
 };
 
-#ifdef CONFIG_PLUGIN
+#if defined(CONFIG_PLUGIN) && !defined(CONFIG_USER_ONLY)
 /*
  * For plugins we sometime need to save the resolved iotlb data before
  * the memory regions get moved around  by io_writex.
@@ -XXX,XX +XXX,XX @@ struct CPUState {
 
 #ifdef CONFIG_PLUGIN
     GArray *plugin_mem_cbs;
+#if !defined(CONFIG_USER_ONLY)
     /* saved iotlb data from io_writex */
     SavedIOTLB saved_iotlb;
-#endif
+#endif /* !CONFIG_USER_ONLY */
+#endif /* CONFIG_PLUGIN */
 
     /* TODO Move common fields from CPUArchState here. */
     int cpu_index;
-- 
2.34.1