Audio, source reorg, HVF changes for 2023-10-06
Subsystems (5)
The following changes since commit 2f3913f4b2ad74baeb5a6f1d36efbd9ecdf1057d:
Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2023-10-05 09:01:01 -0400)
are available in the Git repository at:
https://gitlab.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to 912eef205ae9ccfd477c343a51a7c2dcfae2ba43:
audio, qtest: get rid of QEMU_AUDIO_DRV (2023-10-08 21:08:27 +0200)
----------------------------------------------------------------
* util/log: re-allow switching away from stderr log file
* finish audio configuration rework
* cleanup HVF stubs
* remove more mentions of softmmu
----------------------------------------------------------------
v1->v2: fixed conflicts, moved system/timers-state.h to
include/sysemu/cpu-timers-internal.h
Fiona Ebner (1):
util/log: re-allow switching away from stderr log file
Paolo Bonzini (9):
configure: change $softmmu to $system
cutils: squelch compiler warnings with custom paths
audio: error hints need a trailing \n
audio: disable default backends if -audio/-audiodev is used
audio: extract audio_define_default
audio: extend -audio to allow creating a default backend
audio: do not use first -audiodev as default audio device
audio: reintroduce default audio backend for VNC audio, qtest: get rid of QEMU_AUDIO_DRV
Philippe Mathieu-Daudé (15):
target/i386/hvf: Remove unused includes in 'hvf-i386.h' sysemu/kvm: Restrict hvf_get_supported_cpuid() to x86 targets target/i386: Check for USER_ONLY definition instead of SOFTMMU one softmmu/trace-events: Fix a typo
travis-ci: Correct invalid mentions of 'softmmu' by 'system'
cpu: Correct invalid mentions of 'softmmu' by 'system-mode'
fuzz: Correct invalid mentions of 'softmmu' by 'system'
tcg: Correct invalid mentions of 'softmmu' by 'system-mode'
accel: Rename accel_softmmu* -> accel_system*
gdbstub: Rename 'softmmu' -> 'system'
semihosting: Rename softmmu_FOO_user() -> uaccess_FOO_user() target/i386: Rename i386_softmmu_kvm_ss -> i386_kvm_ss
meson: Rename softmmu_mods -> system_mods
meson: Rename target_softmmu_arch -> target_system_arch
system: Rename softmmu/ directory as system/
.travis.yml | 4 +-
MAINTAINERS | 42 +++++------
accel/{accel-softmmu.c => accel-system.c} | 6 +-
accel/{accel-softmmu.h => accel-system.h} | 6 +-
accel/accel-target.c | 2 +-
accel/meson.build | 2 +-
accel/stubs/meson.build | 10 +--
accel/tcg/icount-common.c | 2 +-
accel/tcg/user-exec.c | 2 +-
audio/audio.c | 85 +++++++++-------------
audio/audio.h | 3 +
configure | 10 +--
cpu-target.c | 2 +-
docs/about/deprecated.rst | 6 --
docs/about/removed-features.rst | 20 ++++-
docs/devel/build-system.rst | 4 +-
docs/devel/qtest.rst | 2 +-
docs/devel/testing.rst | 2 +-
gdbstub/internals.h | 4 +-
gdbstub/meson.build | 10 +--
gdbstub/{softmmu.c => system.c} | 2 +-
gdbstub/trace-events | 2 +-
hw/core/cpu-common.c | 4 +-
include/qemu/atomic128.h | 4 +-
.../semihosting/{softmmu-uaccess.h => uaccess.h} | 24 +++---
.../sysemu/cpu-timers-internal.h | 0
include/sysemu/hvf.h | 3 -
include/sysemu/runstate-action.h | 2 +-
include/tcg/tcg-op-common.h | 2 +-
meson.build | 22 +++---
qemu-options.hx | 29 ++++++--
scripts/checkpatch.pl | 2 +-
scripts/coverity-scan/COMPONENTS.md | 2 +-
scripts/get_maintainer.pl | 2 +-
scripts/oss-fuzz/build.sh | 6 +-
semihosting/arm-compat-semi.c | 4 +-
semihosting/config.c | 2 +-
semihosting/guestfd.c | 2 +-
semihosting/syscalls.c | 2 +-
semihosting/uaccess.c | 14 ++--
softmmu/trace.h | 1 -
stubs/semihost.c | 4 +-
{softmmu => system}/arch_init.c | 0
{softmmu => system}/async-teardown.c | 0
{softmmu => system}/balloon.c | 0
{softmmu => system}/bootdevice.c | 0
{softmmu => system}/cpu-throttle.c | 0
{softmmu => system}/cpu-timers.c | 2 +-
{softmmu => system}/cpus.c | 0
{softmmu => system}/datadir.c | 0
{softmmu => system}/device_tree.c | 0
{softmmu => system}/dirtylimit.c | 0
{softmmu => system}/dma-helpers.c | 0
{softmmu => system}/globals.c | 0
{softmmu => system}/ioport.c | 0
{softmmu => system}/main.c | 0
{softmmu => system}/memory.c | 2 +-
{softmmu => system}/memory_mapping.c | 0
{softmmu => system}/meson.build | 0
{softmmu => system}/physmem.c | 6 +-
{softmmu => system}/qdev-monitor.c | 0
{softmmu => system}/qemu-seccomp.c | 0
{softmmu => system}/qtest.c | 0
{softmmu => system}/rtc.c | 0
{softmmu => system}/runstate-action.c | 0
{softmmu => system}/runstate-hmp-cmds.c | 0
{softmmu => system}/runstate.c | 0
{softmmu => system}/tpm-hmp-cmds.c | 0
{softmmu => system}/tpm.c | 0
{softmmu => system}/trace-events | 2 +-
system/trace.h | 1 +
{softmmu => system}/vl.c | 34 ++++++---
{softmmu => system}/watchpoint.c | 0
target/alpha/meson.build | 2 +-
target/arm/meson.build | 2 +-
target/avr/meson.build | 2 +-
target/cris/meson.build | 2 +-
target/hppa/meson.build | 2 +-
target/i386/cpu.c | 3 +-
target/i386/hvf/hvf-cpu.c | 1 +
target/i386/hvf/hvf-i386.h | 6 +-
target/i386/hvf/x86_cpuid.c | 1 +
target/i386/kvm/meson.build | 10 +--
target/i386/meson.build | 2 +-
target/i386/tcg/misc_helper.c | 2 +-
target/i386/tcg/translate.c | 6 +-
target/loongarch/meson.build | 2 +-
target/m68k/m68k-semi.c | 2 +-
target/m68k/meson.build | 2 +-
target/microblaze/meson.build | 2 +-
target/mips/meson.build | 2 +-
target/mips/tcg/sysemu/mips-semi.c | 2 +-
target/nios2/meson.build | 2 +-
target/nios2/nios2-semi.c | 2 +-
target/openrisc/meson.build | 2 +-
target/ppc/meson.build | 2 +-
target/riscv/meson.build | 2 +-
target/riscv/vector_helper.c | 2 +-
target/rx/meson.build | 2 +-
target/s390x/meson.build | 2 +-
target/sh4/meson.build | 2 +-
target/sparc/meson.build | 2 +-
target/tricore/meson.build | 2 +-
target/xtensa/meson.build | 2 +-
tcg/aarch64/tcg-target.c.inc | 4 +-
tcg/arm/tcg-target.c.inc | 2 +-
tcg/i386/tcg-target.c.inc | 2 +-
tcg/loongarch64/tcg-target.c.inc | 4 +-
tcg/meson.build | 6 +-
tcg/mips/tcg-target.c.inc | 4 +-
tcg/ppc/tcg-target.c.inc | 4 +-
tcg/region.c | 4 +-
tcg/riscv/tcg-target.c.inc | 4 +-
tcg/s390x/tcg-target.c.inc | 4 +-
tcg/sparc64/tcg-target.c.inc | 4 +-
tcg/tcg.c | 11 +--
tests/qtest/fuzz/fuzz.c | 2 +-
tests/qtest/fuzz/fuzz.h | 4 +-
tests/qtest/libqtest.c | 4 +-
tests/tcg/Makefile.target | 2 +-
tests/tcg/multiarch/gdbstub/interrupt.py | 2 +-
tests/tcg/multiarch/gdbstub/memory.py | 2 +-
tests/tcg/multiarch/system/memory.c | 4 +-
tests/tcg/s390x/pgm-specification-softmmu.S | 2 +-
tests/tcg/s390x/pgm-specification.mak | 2 +-
tests/tcg/s390x/softmmu.ld | 2 +-
tests/tcg/xtensa/Makefile.softmmu-target | 2 +-
tests/tcg/xtensaeb/Makefile.softmmu-target | 2 +-
tests/unit/meson.build | 2 +-
ui/vnc.c | 2 +
util/cutils.c | 9 +++
util/log.c | 2 +
132 files changed, 305 insertions(+), 276 deletions(-)
rename accel/{accel-softmmu.c => accel-system.c} (96%)
rename accel/{accel-softmmu.h => accel-system.h} (77%)
rename gdbstub/{softmmu.c => system.c} (99%)
rename include/semihosting/{softmmu-uaccess.h => uaccess.h} (75%)
rename softmmu/timers-state.h => include/sysemu/cpu-timers-internal.h (100%)
delete mode 100644 softmmu/trace.h
rename {softmmu => system}/arch_init.c (100%)
rename {softmmu => system}/async-teardown.c (100%)
rename {softmmu => system}/balloon.c (100%)
rename {softmmu => system}/bootdevice.c (100%)
rename {softmmu => system}/cpu-throttle.c (100%)
rename {softmmu => system}/cpu-timers.c (99%)
rename {softmmu => system}/cpus.c (100%)
rename {softmmu => system}/datadir.c (100%)
rename {softmmu => system}/device_tree.c (100%)
rename {softmmu => system}/dirtylimit.c (100%)
rename {softmmu => system}/dma-helpers.c (100%)
rename {softmmu => system}/globals.c (100%)
rename {softmmu => system}/ioport.c (100%)
rename {softmmu => system}/main.c (100%)
rename {softmmu => system}/memory.c (99%)
rename {softmmu => system}/memory_mapping.c (100%)
rename {softmmu => system}/meson.build (100%)
rename {softmmu => system}/physmem.c (99%)
rename {softmmu => system}/qdev-monitor.c (100%)
rename {softmmu => system}/qemu-seccomp.c (100%)
rename {softmmu => system}/qtest.c (100%)
rename {softmmu => system}/rtc.c (100%)
rename {softmmu => system}/runstate-action.c (100%)
rename {softmmu => system}/runstate-hmp-cmds.c (100%)
rename {softmmu => system}/runstate.c (100%)
rename {softmmu => system}/tpm-hmp-cmds.c (100%)
rename {softmmu => system}/tpm.c (100%)
rename {softmmu => system}/trace-events (99%)
create mode 100644 system/trace.h
rename {softmmu => system}/vl.c (99%)
rename {softmmu => system}/watchpoint.c (100%)Signature · 1 line
2.41.0
[PULL 09/25] tcg: Correct invalid mentions of 'softmmu' by 'system-mode'
From: Philippe Mathieu-Daudé <[email protected]>
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Message-ID: <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>
--- accel/tcg/user-exec.c | 2 +- docs/devel/testing.rst | 2 +- include/qemu/atomic128.h | 4 ++-- include/tcg/tcg-op-common.h | 2 +- target/riscv/vector_helper.c | 2 +- tcg/aarch64/tcg-target.c.inc | 4 ++-- tcg/arm/tcg-target.c.inc | 2 +- tcg/i386/tcg-target.c.inc | 2 +- tcg/loongarch64/tcg-target.c.inc | 4 ++-- tcg/meson.build | 6 +++--- tcg/mips/tcg-target.c.inc | 4 ++-- tcg/ppc/tcg-target.c.inc | 4 ++-- tcg/region.c | 4 ++-- tcg/riscv/tcg-target.c.inc | 4 ++-- tcg/s390x/tcg-target.c.inc | 4 ++-- tcg/sparc64/tcg-target.c.inc | 4 ++-- tcg/tcg.c | 11 ++++++----- tests/tcg/Makefile.target | 2 +- tests/tcg/multiarch/gdbstub/interrupt.py | 2 +- tests/tcg/multiarch/gdbstub/memory.py | 2 +- tests/tcg/multiarch/system/memory.c | 4 ++-- tests/tcg/s390x/pgm-specification-softmmu.S | 2 +- tests/tcg/s390x/pgm-specification.mak | 2 +- tests/tcg/s390x/softmmu.ld | 2 +- tests/tcg/xtensa/Makefile.softmmu-target | 2 +- tests/tcg/xtensaeb/Makefile.softmmu-target | 2 +- 26 files changed, 43 insertions(+), 42 deletions(-)
accel/tcg/user-exec.c +1 -1
@@ -940,7 +940,7 @@ void *page_get_target_data(target_ulong address)void page_reset_target_data (target_ulong start,target_ulong last) { }#endif /* TARGET_PAGE_DATA_SIZE */ -/* The softmmu versions of these helpers are in cputlb.c. */ +/* The system-mode versions of these helpers are in cputlb.c. */ static void *cpu_mmu_lookup (CPUState *cpu,vaddr addr,MemOp mop,uintptr_t ra,MMUAccessType type)
docs/devel/testing.rst +1 -1
@@ -1458,7 +1458,7 @@ TCG test dependencies ~~~~~~~~~~~~~~~~~~~~~ The TCG tests are deliberately very light on dependencies and are -either totally bare with minimal gcc lib support (for softmmu tests) +either totally bare with minimal gcc lib support (for system-mode tests) or just glibc (for linux-user tests). This is because getting a cross compiler to work with additional libraries can be challenging.
include/qemu/atomic128.h +2 -2
@@ -43,8 +43,8 @@* See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80878 * * This interpretation is not especially helpful for QEMU. -* For softmmu, all RAM is always read/write from the hypervisor. -* For user-only, if the guest doesn't implement such an __atomic_read +* For system-mode, all RAM is always read/write from the hypervisor. +* For user-mode, if the guest doesn't implement such an __atomic_read * then the host need not worry about it either. * * Moreover, using libatomic is not an option, because its interface is
include/tcg/tcg-op-common.h +1 -1
@@ -265,7 +265,7 @@ void tcg_gen_exit_tb(const TranslationBlock *tb, unsigned idx);* * See tcg/README for more info about this TCG operation. * -* NOTE: In softmmu emulation, direct jumps with goto_tb are only safe within +* NOTE: In system emulation, direct jumps with goto_tb are only safe within * the pages this TB resides in because we don't take care of direct jumps when * address mapping changes, e.g. in tlb_flush(). In user mode, there's only a * static address translation, so the destination address is always valid, TBs
target/riscv/vector_helper.c +1 -1
@@ -100,7 +100,7 @@ static inline target_ulong adjust_addr(CPURISCVState *env, target_ulong addr)/* * This function checks watchpoint before real load operation. * -* In softmmu mode, the TLB API probe_access is enough for watchpoint check. +* In system mode, the TLB API probe_access is enough for watchpoint check. * In user mode, there is no watchpoint support now. * * It will trigger an exception if there is no mapping in TLB
tcg/aarch64/tcg-target.c.inc +2 -2
@@ -1643,8 +1643,8 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) #define MIN_TLB_MASK_TABLE_OFS -512 /* - * For softmmu, perform the TLB load and compare. - * For useronly, perform any required alignment tests. + * For system-mode, perform the TLB load and compare. + * For user-mode, perform any required alignment tests. * In both cases, return a TCGLabelQemuLdst structure if the slow path * is required and fill in @h with the host address for the fast path. */
tcg/arm/tcg-target.c.inc +1 -1
@@ -353,7 +353,7 @@ static bool patch_reloc(tcg_insn_unit *code_ptr, int type, #define ALL_VECTOR_REGS 0xffff0000u /* - * r0-r3 will be overwritten when reading the tlb entry (softmmu only); + * r0-r3 will be overwritten when reading the tlb entry (system-mode only); * r14 will be overwritten by the BLNE branching to the slow path. */ #ifdef CONFIG_SOFTMMU
tcg/i386/tcg-target.c.inc +1 -1
@@ -2276,7 +2276,7 @@ static void tcg_out_qemu_st_direct(TCGContext *s, TCGReg datalo, TCGReg datahi, int movop = OPC_MOVL_EvGv; /* - * Do big-endian stores with movbe or softmmu. + * Do big-endian stores with movbe or system-mode. * User-only without movbe will have its swapping done generically. */ if (memop & MO_BSWAP) {
tcg/loongarch64/tcg-target.c.inc +2 -2
@@ -891,8 +891,8 @@ bool tcg_target_has_memory_bswap(MemOp memop) #define MIN_TLB_MASK_TABLE_OFS -(1 << 11) /* - * For softmmu, perform the TLB load and compare. - * For useronly, perform any required alignment tests. + * For system-mode, perform the TLB load and compare. + * For user-mode, perform any required alignment tests. * In both cases, return a TCGLabelQemuLdst structure if the slow path * is required and fill in @h with the host address for the fast path. */
tcg/meson.build +3 -3
@@ -34,12 +34,12 @@ tcg_user = declare_dependency(link_with: libtcg_user, dependencies: tcg_ss.dependencies()) user_ss.add(tcg_user) -libtcg_softmmu = static_library('tcg_softmmu', +libtcg_system = static_library('tcg_system', tcg_ss.sources() + genh, name_suffix: 'fa', c_args: '-DCONFIG_SOFTMMU', build_by_default: false) -tcg_softmmu = declare_dependency(link_with: libtcg_softmmu, +tcg_system = declare_dependency(link_with: libtcg_system, dependencies: tcg_ss.dependencies()) -system_ss.add(tcg_softmmu) +system_ss.add(tcg_system)
tcg/mips/tcg-target.c.inc +2 -2
@@ -1258,8 +1258,8 @@ bool tcg_target_has_memory_bswap(MemOp memop) #define MIN_TLB_MASK_TABLE_OFS -32768 /* - * For softmmu, perform the TLB load and compare. - * For useronly, perform any required alignment tests. + * For system-mode, perform the TLB load and compare. + * For user-mode, perform any required alignment tests. * In both cases, return a TCGLabelQemuLdst structure if the slow path * is required and fill in @h with the host address for the fast path. */
tcg/ppc/tcg-target.c.inc +2 -2
@@ -2091,8 +2091,8 @@ bool tcg_target_has_memory_bswap(MemOp memop) #define MIN_TLB_MASK_TABLE_OFS -32768 /* - * For softmmu, perform the TLB load and compare. - * For useronly, perform any required alignment tests. + * For system-mode, perform the TLB load and compare. + * For user-mode, perform any required alignment tests. * In both cases, return a TCGLabelQemuLdst structure if the slow path * is required and fill in @h with the host address for the fast path. */
tcg/region.c +2 -2
@@ -733,7 +733,7 @@ static int alloc_code_gen_buffer(size_t size, int splitwx, Error **errp)* and then assigning regions to TCG threads so that the threads can translate * code in parallel without synchronization. * -* In softmmu the number of TCG threads is bounded by max_cpus, so we use at +* In system-mode the number of TCG threads is bounded by max_cpus, so we use at * least max_cpus regions in MTTCG. In !MTTCG we use a single region. * Note that the TCG options from the command-line (i.e. -accel accel=tcg,[...]) * must have been parsed before calling this function, since it calls
@@ -749,7 +749,7 @@ static int alloc_code_gen_buffer(size_t size, int splitwx, Error **errp)* * However, this user-mode limitation is unlikely to be a significant problem * in practice. Multi-threaded guests share most if not all of their translated -* code, which makes parallel code generation less appealing than in softmmu. +* code, which makes parallel code generation less appealing than in system-mode */ void tcg_region_init (size_t tb_size,int splitwx,unsigned max_cpus) {
tcg/riscv/tcg-target.c.inc +2 -2
@@ -1227,8 +1227,8 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l) #define MIN_TLB_MASK_TABLE_OFS -(1 << 11) /* - * For softmmu, perform the TLB load and compare. - * For useronly, perform any required alignment tests. + * For system-mode, perform the TLB load and compare. + * For user-mode, perform any required alignment tests. * In both cases, return a TCGLabelQemuLdst structure if the slow path * is required and fill in @h with the host address for the fast path. */
tcg/s390x/tcg-target.c.inc +2 -2
@@ -1750,8 +1750,8 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) #define MIN_TLB_MASK_TABLE_OFS -(1 << 19) /* - * For softmmu, perform the TLB load and compare. - * For useronly, perform any required alignment tests. + * For system-mode, perform the TLB load and compare. + * For user-mode, perform any required alignment tests. * In both cases, return a TCGLabelQemuLdst structure if the slow path * is required and fill in @h with the host address for the fast path. */
tcg/sparc64/tcg-target.c.inc +2 -2
@@ -1033,8 +1033,8 @@ bool tcg_target_has_memory_bswap(MemOp memop) #define MIN_TLB_MASK_TABLE_OFS -(1 << 12) /* - * For softmmu, perform the TLB load and compare. - * For useronly, perform any required alignment tests. + * For system-mode, perform the TLB load and compare. + * For user-mode, perform any required alignment tests. * In both cases, return a TCGLabelQemuLdst structure if the slow path * is required and fill in @h with the host address for the fast path. */
tcg/tcg.c +6 -5
@@ -760,12 +760,13 @@ static void alloc_tcg_plugin_context(TCGContext *s)* In user-mode we just point tcg_ctx to tcg_init_ctx. See the documentation * of tcg_region_init() for the reasoning behind this. * -* In softmmu each caller registers its context in tcg_ctxs[]. Note that in -* softmmu tcg_ctxs[] does not track tcg_ctx_init, since the initial context +* In system-mode each caller registers its context in tcg_ctxs[]. Note that in +* system-mode tcg_ctxs[] does not track tcg_ctx_init, since the initial context * is not used anymore for translation once this function is called. * -* Not tracking tcg_init_ctx in tcg_ctxs[] in softmmu keeps code that iterates -* over the array (e.g. tcg_code_size() the same for both softmmu and user-mode. +* Not tracking tcg_init_ctx in tcg_ctxs[] in system-mode keeps code that +* iterates over the array (e.g. tcg_code_size() the same for both system/user +* modes. */ #ifdef CONFIG_USER_ONLY void tcg_register_thread (void )
@@ -1349,7 +1350,7 @@ static void tcg_context_init(unsigned max_cpus)* In user-mode we simply share the init context among threads, since we * use a single region. See the documentation tcg_region_init() for the * reasoning behind this. -* In softmmu we will have at most max_cpus TCG threads. +* In system-mode we will have at most max_cpus TCG threads. */ #ifdef CONFIG_USER_ONLY tcg_ctxs = &tcg_ctx;
tests/tcg/Makefile.target +1 -1
@@ -120,7 +120,7 @@ endif %: %.S $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) else -# For softmmu targets we include a different Makefile fragment as the +# For system targets we include a different Makefile fragment as the # build options for bare programs are usually pretty different. They # are expected to provide their own build recipes. EXTRA_CFLAGS += -ffreestanding
tests/tcg/multiarch/gdbstub/interrupt.py +1 -1
@@ -1,6 +1,6 @@ from __future__ import print_function # -# Test some of the softmmu debug features with the multiarch memory +# Test some of the system debug features with the multiarch memory # test. It is a port of the original vmlinux focused test case but # using the "memory" test instead. #
tests/tcg/multiarch/gdbstub/memory.py +1 -1
@@ -1,6 +1,6 @@ from __future__ import print_function # -# Test some of the softmmu debug features with the multiarch memory +# Test some of the system debug features with the multiarch memory # test. It is a port of the original vmlinux focused test case but # using the "memory" test instead. #
tests/tcg/multiarch/system/memory.c +2 -2
@@ -1,14 +1,14 @@/* * Memory Test * -* This is intended to test the softmmu code and ensure we properly +* This is intended to test the system-mode code and ensure we properly * behave across normal and unaligned accesses across several pages. * We are not replicating memory tests for stuck bits and other * hardware level failures but looking for issues with different size * accesses when access is: * * - unaligned at various sizes (if -DCHECK_UNALIGNED set) -* - spanning a (softmmu) page +* - spanning a (system) page * - sign extension when loading */
tests/tcg/s390x/pgm-specification-softmmu.S +1 -1
@@ -1,5 +1,5 @@ /* - * Common softmmu code for specification exception testing. + * Common system code for specification exception testing. * * SPDX-License-Identifier: GPL-2.0-or-later */
tests/tcg/s390x/pgm-specification.mak +1 -1
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # List of specification exception tests. -# Shared between the softmmu and the user makefiles. +# Shared between the system and the user makefiles. PGM_SPECIFICATION_TESTS = \ br-odd \ cgrl-unaligned \
tests/tcg/s390x/softmmu.ld +1 -1
@@ -1,5 +1,5 @@ /* - * Linker script for the softmmu test kernels. + * Linker script for the system test kernels. * * SPDX-License-Identifier: GPL-2.0-or-later */
tests/tcg/xtensa/Makefile.softmmu-target +1 -1
@@ -1,5 +1,5 @@ # -# Xtensa softmmu tests +# Xtensa system tests # CORE=dc232b
tests/tcg/xtensaeb/Makefile.softmmu-target +1 -1
@@ -1,5 +1,5 @@ # -# Xtensa softmmu tests +# Xtensa system tests # include $(SRC_PATH)/tests/tcg/xtensa/Makefile.softmmu-target
Signature · 1 line
2.41.0
[PULL 16/25] system: Rename softmmu/ directory as system/
In reply to Paolo BonziniFrom: Philippe Mathieu-Daudé <[email protected]>
The softmmu/ directory contains files specific to system emulation. Rename it as system/. Update meson rules, the MAINTAINERS file and all the documentation and comments.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Message-ID: <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>
---
MAINTAINERS | 42 +++++++++----------
accel/tcg/icount-common.c | 2 +-
docs/devel/qtest.rst | 2 +-
.../sysemu/cpu-timers-internal.h | 0
include/sysemu/runstate-action.h | 2 +-
meson.build | 8 ++--
scripts/checkpatch.pl | 2 +-
scripts/coverity-scan/COMPONENTS.md | 2 +-
scripts/get_maintainer.pl | 2 +-
scripts/oss-fuzz/build.sh | 6 +--
softmmu/trace.h | 1 -
{softmmu => system}/arch_init.c | 0
{softmmu => system}/async-teardown.c | 0
{softmmu => system}/balloon.c | 0
{softmmu => system}/bootdevice.c | 0
{softmmu => system}/cpu-throttle.c | 0
{softmmu => system}/cpu-timers.c | 2 +-
{softmmu => system}/cpus.c | 0
{softmmu => system}/datadir.c | 0
{softmmu => system}/device_tree.c | 0
{softmmu => system}/dirtylimit.c | 0
{softmmu => system}/dma-helpers.c | 0
{softmmu => system}/globals.c | 0
{softmmu => system}/ioport.c | 0
{softmmu => system}/main.c | 0
{softmmu => system}/memory.c | 0
{softmmu => system}/memory_mapping.c | 0
{softmmu => system}/meson.build | 0
{softmmu => system}/physmem.c | 6 ++-
{softmmu => system}/qdev-monitor.c | 0
{softmmu => system}/qemu-seccomp.c | 0
{softmmu => system}/qtest.c | 0
{softmmu => system}/rtc.c | 0
{softmmu => system}/runstate-action.c | 0
{softmmu => system}/runstate-hmp-cmds.c | 0
{softmmu => system}/runstate.c | 0
{softmmu => system}/tpm-hmp-cmds.c | 0
{softmmu => system}/tpm.c | 0
{softmmu => system}/trace-events | 0
system/trace.h | 1 +
{softmmu => system}/vl.c | 0
{softmmu => system}/watchpoint.c | 0
tests/unit/meson.build | 2 +-
43 files changed, 41 insertions(+), 39 deletions(-)
rename softmmu/timers-state.h => include/sysemu/cpu-timers-internal.h (100%)
delete mode 100644 softmmu/trace.h
rename {softmmu => system}/arch_init.c (100%)
rename {softmmu => system}/async-teardown.c (100%)
rename {softmmu => system}/balloon.c (100%)
rename {softmmu => system}/bootdevice.c (100%)
rename {softmmu => system}/cpu-throttle.c (100%)
rename {softmmu => system}/cpu-timers.c (99%)
rename {softmmu => system}/cpus.c (100%)
rename {softmmu => system}/datadir.c (100%)
rename {softmmu => system}/device_tree.c (100%)
rename {softmmu => system}/dirtylimit.c (100%)
rename {softmmu => system}/dma-helpers.c (100%)
rename {softmmu => system}/globals.c (100%)
rename {softmmu => system}/ioport.c (100%)
rename {softmmu => system}/main.c (100%)
rename {softmmu => system}/memory.c (100%)
rename {softmmu => system}/memory_mapping.c (100%)
rename {softmmu => system}/meson.build (100%)
rename {softmmu => system}/physmem.c (99%)
rename {softmmu => system}/qdev-monitor.c (100%)
rename {softmmu => system}/qemu-seccomp.c (100%)
rename {softmmu => system}/qtest.c (100%)
rename {softmmu => system}/rtc.c (100%)
rename {softmmu => system}/runstate-action.c (100%)
rename {softmmu => system}/runstate-hmp-cmds.c (100%)
rename {softmmu => system}/runstate.c (100%)
rename {softmmu => system}/tpm-hmp-cmds.c (100%)
rename {softmmu => system}/tpm.c (100%)
rename {softmmu => system}/trace-events (100%)
create mode 100644 system/trace.h
rename {softmmu => system}/vl.c (100%)
rename {softmmu => system}/watchpoint.c (100%)MAINTAINERS +21 -21
@@ -137,8 +137,8 @@ Overall TCG CPUs M: Richard Henderson <[email protected]> R: Paolo Bonzini <[email protected]> S: Maintained -F: softmmu/cpus.c -F: softmmu/watchpoint.c +F: system/cpus.c +F: system/watchpoint.c F: cpu-common.c F: cpu-target.c F: page-vary-target.c
@@ -2108,7 +2108,7 @@ S: Maintained F: docs/interop/virtio-balloon-stats.rst F: hw/virtio/virtio-balloon*.c F: include/hw/virtio/virtio-balloon.h -F: softmmu/balloon.c +F: system/balloon.c F: include/sysemu/balloon.h virtio-9p
@@ -2795,7 +2795,7 @@ Device Tree M: Alistair Francis <[email protected]> R: David Gibson <[email protected]> S: Maintained -F: softmmu/device_tree.c +F: system/device_tree.c F: include/sysemu/device_tree.h Dump
@@ -2851,11 +2851,11 @@ F: include/exec/memory.h F: include/exec/ram_addr.h F: include/exec/ramblock.h F: include/sysemu/memory_mapping.h -F: softmmu/dma-helpers.c -F: softmmu/ioport.c -F: softmmu/memory.c -F: softmmu/memory_mapping.c -F: softmmu/physmem.c +F: system/dma-helpers.c +F: system/ioport.c +F: system/memory.c +F: system/memory_mapping.c +F: system/physmem.c F: include/exec/memory-internal.h F: scripts/coccinelle/memory-region-housekeeping.cocci
@@ -2908,12 +2908,12 @@ F: include/sysemu/runstate.h F: include/sysemu/runstate-action.h F: util/main-loop.c F: util/qemu-timer.c -F: softmmu/vl.c -F: softmmu/main.c -F: softmmu/cpus.c -F: softmmu/cpu-throttle.c -F: softmmu/cpu-timers.c -F: softmmu/runstate* +F: system/vl.c +F: system/main.c +F: system/cpus.c +F: system/cpu-throttle.c +F: system/cpu-timers.c +F: system/runstate* F: qapi/run-state.json Read, Copy, Update (RCU)
@@ -3087,7 +3087,7 @@ F: qapi/qom.json F: qapi/qdev.json F: scripts/coccinelle/qom-parent-type.cocci F: scripts/qom-cast-macro-clean-cocci-gen.py -F: softmmu/qdev-monitor.c +F: system/qdev-monitor.c F: stubs/qdev.c F: qom/ F: tests/unit/check-qom-interface.c
@@ -3121,7 +3121,7 @@ M: Thomas Huth <[email protected]> M: Laurent Vivier <[email protected]> R: Paolo Bonzini <[email protected]> S: Maintained -F: softmmu/qtest.c +F: system/qtest.c F: accel/qtest/ F: tests/qtest/ F: docs/devel/qgraph.rst
@@ -3197,7 +3197,7 @@ F: scripts/simpletrace.py TPM M: Stefan Berger <[email protected]> S: Maintained -F: softmmu/tpm* +F: system/tpm* F: hw/tpm/* F: include/hw/acpi/tpm.h F: include/sysemu/tpm*
@@ -3242,7 +3242,7 @@ F: migration/rdma* Migration dirty limit and dirty page rate M: Hyman Huang <[email protected]> S: Maintained -F: softmmu/dirtylimit.c +F: system/dirtylimit.c F: include/sysemu/dirtylimit.h F: migration/dirtyrate.c F: migration/dirtyrate.h
@@ -3266,7 +3266,7 @@ F: scripts/xml-preprocess* Seccomp M: Daniel P. Berrange <[email protected]> S: Odd Fixes -F: softmmu/qemu-seccomp.c +F: system/qemu-seccomp.c F: include/sysemu/seccomp.h F: tests/unit/test-seccomp.c
@@ -3685,7 +3685,7 @@ T: git https://github.com/stefanha/qemu.git block Bootdevice M: Gonglei <[email protected]> S: Maintained -F: softmmu/bootdevice.c +F: system/bootdevice.c Quorum M: Alberto Garcia <[email protected]>
accel/tcg/icount-common.c +1 -1
@@ -37,7 +37,7 @@#include "hw/core/cpu.h" #include "sysemu/cpu-timers.h" #include "sysemu/cpu-throttle.h" -#include "softmmu/timers-state.h" +#include "sysemu/cpu-timers-internal.h" /* * ICOUNT: Instruction Counter
docs/devel/qtest.rst +1 -1
@@ -81,7 +81,7 @@ which you can run manually. QTest Protocol -------------- -.. kernel-doc:: softmmu/qtest.c +.. kernel-doc:: system/qtest.c :doc: QTest Protocol
include/sysemu/cpu-timers-internal.h renamed from softmmu/timers-state.h +0 -0
include/sysemu/runstate-action.h +1 -1
@@ -11,7 +11,7 @@#include "qapi/qapi-commands-run-state.h" -/* in softmmu/runstate-action.c */ +/* in system/runstate-action.c */ extern RebootAction reboot_action;extern ShutdownAction shutdown_action;extern PanicAction panic_action;
meson.build +4 -4
@@ -3291,7 +3291,7 @@ if have_system 'hw/gpio', 'migration', 'net', - 'softmmu', + 'system', 'ui', 'hw/remote', ]
@@ -3418,7 +3418,7 @@ endif common_ss.add(files('cpu-common.c')) specific_ss.add(files('cpu-target.c')) -subdir('softmmu') +subdir('system') # Work around a gcc bug/misfeature wherein constant propagation looks # through an alias:
@@ -3797,14 +3797,14 @@ foreach target : target_dirs execs = [{ 'name': 'qemu-system-' + target_name, 'win_subsystem': 'console', - 'sources': files('softmmu/main.c'), + 'sources': files('system/main.c'), 'dependencies': [] }] if targetos == 'windows' and (sdl.found() or gtk.found()) execs += [{ 'name': 'qemu-system-' + target_name + 'w', 'win_subsystem': 'windows', - 'sources': files('softmmu/main.c'), + 'sources': files('system/main.c'), 'dependencies': [] }] endif
scripts/checkpatch.pl +1 -1
@@ -466,7 +466,7 @@ sub top_of_kernel_tree { my @tree_check = ( "COPYING", "MAINTAINERS", "Makefile", "README.rst", "docs", "VERSION", - "linux-user", "softmmu" + "linux-user", "system" ); foreach my $check (@tree_check) {
scripts/coverity-scan/COMPONENTS.md +1 -1
@@ -148,7 +148,7 @@ tcg ~ (/qemu)?(/accel/tcg|/replay|/tcg)/.* sysemu - ~ (/qemu)?(/softmmu/.*|/accel/.*) + ~ (/qemu)?(/system/.*|/accel/.*) (headers) ~ (/qemu)?(/include/.*)
scripts/get_maintainer.pl +1 -1
@@ -796,7 +796,7 @@ sub top_of_tree { && (-d "${lk_path}docs") && (-f "${lk_path}VERSION") && (-d "${lk_path}linux-user/") - && (-d "${lk_path}softmmu/")) { + && (-d "${lk_path}system/")) { return 1; } return 0;
scripts/oss-fuzz/build.sh +3 -3
@@ -43,10 +43,10 @@ EXTRA_CFLAGS="$CFLAGS -U __OPTIMIZE__" if ! { [ -e "./COPYING" ] && [ -e "./MAINTAINERS" ] && [ -e "./Makefile" ] && - [ -e "./docs" ] && + [ -d "./docs" ] && [ -e "./VERSION" ] && - [ -e "./linux-user" ] && - [ -e "./softmmu" ];} ; then + [ -d "./linux-user" ] && + [ -d "./system" ];} ; then fatal "Please run the script from the top of the QEMU tree" fi
softmmu/trace.h deleted +0 -1
@@ -1 +0,0 @@ -#include "trace/trace-softmmu.h"
system/arch_init.c renamed from softmmu/arch_init.c +0 -0
system/async-teardown.c renamed from softmmu/async-teardown.c +0 -0
system/balloon.c renamed from softmmu/balloon.c +0 -0
system/bootdevice.c renamed from softmmu/bootdevice.c +0 -0
system/cpu-throttle.c renamed from softmmu/cpu-throttle.c +0 -0
system/cpu-timers.c renamed from softmmu/cpu-timers.c +1 -1
@@ -36,7 +36,7 @@#include "hw/core/cpu.h" #include "sysemu/cpu-timers.h" #include "sysemu/cpu-throttle.h" -#include "timers-state.h" +#include "sysemu/cpu-timers-internal.h" /* clock and ticks */
system/cpus.c renamed from softmmu/cpus.c +0 -0
system/datadir.c renamed from softmmu/datadir.c +0 -0
system/device_tree.c renamed from softmmu/device_tree.c +0 -0
system/dirtylimit.c renamed from softmmu/dirtylimit.c +0 -0
system/dma-helpers.c renamed from softmmu/dma-helpers.c +0 -0
system/globals.c renamed from softmmu/globals.c +0 -0
system/ioport.c renamed from softmmu/ioport.c +0 -0
system/main.c renamed from softmmu/main.c +0 -0
system/memory.c renamed from softmmu/memory.c +0 -0
system/memory_mapping.c renamed from softmmu/memory_mapping.c +0 -0
system/meson.build renamed from softmmu/meson.build +0 -0
system/physmem.c renamed from softmmu/physmem.c +4 -2
@@ -2301,8 +2301,10 @@ RAMBlock *qemu_ram_block_by_name(const char *name)return NULL ; } -/* Some of the softmmu routines need to translate from a host pointer -(typically a TLB entry) back to a ram offset. */ +/* +* Some of the system routines need to translate from a host pointer +* (typically a TLB entry) back to a ram offset. +*/ ram_addr_t qemu_ram_addr_from_host (void *ptr) {RAMBlock *block;
system/qdev-monitor.c renamed from softmmu/qdev-monitor.c +0 -0
system/qemu-seccomp.c renamed from softmmu/qemu-seccomp.c +0 -0
system/qtest.c renamed from softmmu/qtest.c +0 -0
system/rtc.c renamed from softmmu/rtc.c +0 -0
system/runstate-action.c renamed from softmmu/runstate-action.c +0 -0
system/runstate-hmp-cmds.c renamed from softmmu/runstate-hmp-cmds.c +0 -0
system/runstate.c renamed from softmmu/runstate.c +0 -0
system/tpm-hmp-cmds.c renamed from softmmu/tpm-hmp-cmds.c +0 -0
system/tpm.c renamed from softmmu/tpm.c +0 -0
system/trace-events renamed from softmmu/trace-events +0 -0
system/trace.h new file +1 -0
@@ -0,0 +1 @@ +#include "trace/trace-system.h"
system/vl.c renamed from softmmu/vl.c +0 -0
system/watchpoint.c renamed from softmmu/watchpoint.c +0 -0
tests/unit/meson.build +1 -1
@@ -59,7 +59,7 @@ if have_system or have_tools } if seccomp.found() - tests += {'test-seccomp': ['../../softmmu/qemu-seccomp.c', seccomp]} + tests += {'test-seccomp': ['../../system/qemu-seccomp.c', seccomp]} endif endif
Signature · 1 line
2.41.0
Stefan Hajnoczi
AppliedApplied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/8.2 for any user-visible changes.