Richard clarified my confusion with CONFIG_SOFTMMU from v1: https://lore.kernel.org/qemu-devel/7913570a-8bf6-2ac9-6869-fab872737...@linaro.org/
This series tries to make it a bit more explicit by removing mentions of CONFIG_SOFTMMU in non-TCG code. We replace CONFIG_SOFTMMU by !CONFIG_USER_ONLY in C code and by CONFIG_SYSTEM_ONLY in meson config files. Philippe Mathieu-Daudé (9): target/tricore: Remove pointless CONFIG_SOFTMMU guard target/i386: Check for USER_ONLY definition instead of SOFTMMU one 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 docs/devel/build-system.rst | 14 +-- meson.build | 15 +-- accel/tcg/internal.h | 6 +- include/hw/core/cpu.h | 4 +- include/hw/core/tcg-cpu-ops.h | 102 ++++++++++----------- target/m68k/helper.h | 2 +- accel/tcg/cpu-exec.c | 4 +- target/i386/tcg/translate.c | 2 +- target/m68k/cpu.c | 14 ++- 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 - 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 | 142 ++++++++++++++--------------- hw/net/can/meson.build | 14 +-- 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 +++--- 119 files changed, 813 insertions(+), 818 deletions(-) -- 2.38.1