[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/26] gdbstub: Rename 'softmmu' -> 'system'
From: |
Paolo Bonzini |
Subject: |
[PULL 11/26] gdbstub: Rename 'softmmu' -> 'system' |
Date: |
Fri, 6 Oct 2023 13:13:57 +0200 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
We have gdbstub/user.c for user emulation code,
use gdbstub/system.c for system emulation part.
Rename s/softmmu/system/ in meson and few comments.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231004090629.37473-8-philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
gdbstub/internals.h | 4 ++--
gdbstub/meson.build | 10 +++++-----
gdbstub/{softmmu.c => system.c} | 2 +-
gdbstub/trace-events | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
rename gdbstub/{softmmu.c => system.c} (99%)
diff --git a/gdbstub/internals.h b/gdbstub/internals.h
index fee243081ff..f7fd1bede50 100644
--- a/gdbstub/internals.h
+++ b/gdbstub/internals.h
@@ -103,7 +103,7 @@ static inline int tohex(int v)
}
/*
- * Connection helpers for both softmmu and user backends
+ * Connection helpers for both system and user backends
*/
void gdb_put_strbuf(void);
@@ -229,7 +229,7 @@ void gdb_breakpoint_remove_all(CPUState *cs);
* @is_write: is it a write operation
*
* This function is specialised depending on the mode we are running
- * in. For softmmu guests we can switch the interpretation of the
+ * in. For system guests we can switch the interpretation of the
* address to a physical address.
*/
int gdb_target_memory_rw_debug(CPUState *cs, hwaddr addr,
diff --git a/gdbstub/meson.build b/gdbstub/meson.build
index a5a1f4e433f..e5bccba34e5 100644
--- a/gdbstub/meson.build
+++ b/gdbstub/meson.build
@@ -1,6 +1,6 @@
#
# The main gdbstub still relies on per-build definitions of various
-# types. The bits pushed to softmmu/user.c try to use guest agnostic
+# types. The bits pushed to system/user.c try to use guest agnostic
# types such as hwaddr.
#
@@ -12,7 +12,7 @@ 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_system_ss.add(files('gdbstub.c', 'softmmu.c'))
+gdb_system_ss.add(files('gdbstub.c', 'system.c'))
gdb_user_ss = gdb_user_ss.apply(config_targetos, strict: false)
gdb_system_ss = gdb_system_ss.apply(config_targetos, strict: false)
@@ -23,15 +23,15 @@ libgdb_user = static_library('gdb_user',
c_args: '-DCONFIG_USER_ONLY',
build_by_default: false)
-libgdb_softmmu = static_library('gdb_softmmu',
+libgdb_system = static_library('gdb_system',
gdb_system_ss.sources() + genh,
name_suffix: 'fa',
build_by_default: false)
gdb_user = declare_dependency(link_whole: libgdb_user)
user_ss.add(gdb_user)
-gdb_softmmu = declare_dependency(link_whole: libgdb_softmmu)
-system_ss.add(gdb_softmmu)
+gdb_system = declare_dependency(link_whole: libgdb_system)
+system_ss.add(gdb_system)
common_ss.add(files('syscalls.c'))
diff --git a/gdbstub/softmmu.c b/gdbstub/system.c
similarity index 99%
rename from gdbstub/softmmu.c
rename to gdbstub/system.c
index 9f0b8b54977..189975b1d62 100644
--- a/gdbstub/softmmu.c
+++ b/gdbstub/system.c
@@ -104,7 +104,7 @@ static void gdb_chr_event(void *opaque, QEMUChrEvent event)
}
/*
- * In softmmu mode we stop the VM and wait to send the syscall packet
+ * In system-mode we stop the VM and wait to send the syscall packet
* until notification that the CPU has stopped. This must be done
* because if the packet is sent now the reply from the syscall
* request could be received while the CPU is still in the running
diff --git a/gdbstub/trace-events b/gdbstub/trace-events
index 7bc79a73c42..4fd126a38c1 100644
--- a/gdbstub/trace-events
+++ b/gdbstub/trace-events
@@ -28,5 +28,5 @@ gdbstub_err_checksum_invalid(uint8_t ch) "got invalid command
checksum digit: 0x
gdbstub_err_checksum_incorrect(uint8_t expected, uint8_t got) "got command
packet with incorrect checksum, expected=0x%02x, received=0x%02x"
gdbstub_err_unexpected_runpkt(uint8_t ch) "unexpected packet (0x%02x) while
target running"
-# softmmu.c
+# system.c
gdbstub_hit_watchpoint(const char *type, int cpu_gdb_index, uint64_t vaddr)
"Watchpoint hit, type=\"%s\" cpu=%d, vaddr=0x%" PRIx64 ""
--
2.41.0
- [PULL 04/26] target/i386: Check for USER_ONLY definition instead of SOFTMMU one, (continued)
- [PULL 04/26] target/i386: Check for USER_ONLY definition instead of SOFTMMU one, Paolo Bonzini, 2023/10/06
- [PULL 05/26] softmmu/trace-events: Fix a typo, Paolo Bonzini, 2023/10/06
- [PULL 08/26] fuzz: Correct invalid mentions of 'softmmu' by 'system', Paolo Bonzini, 2023/10/06
- [PULL 03/26] util/log: re-allow switching away from stderr log file, Paolo Bonzini, 2023/10/06
- [PULL 02/26] sysemu/kvm: Restrict hvf_get_supported_cpuid() to x86 targets, Paolo Bonzini, 2023/10/06
- [PULL 09/26] tcg: Correct invalid mentions of 'softmmu' by 'system-mode', Paolo Bonzini, 2023/10/06
- [PULL 10/26] accel: Rename accel_softmmu* -> accel_system*, Paolo Bonzini, 2023/10/06
- [PULL 12/26] semihosting: Rename softmmu_FOO_user() -> uaccess_FOO_user(), Paolo Bonzini, 2023/10/06
- [PULL 07/26] cpu: Correct invalid mentions of 'softmmu' by 'system-mode', Paolo Bonzini, 2023/10/06
- [PULL 16/26] meson: Rename target_softmmu_arch -> target_system_arch, Paolo Bonzini, 2023/10/06
- [PULL 11/26] gdbstub: Rename 'softmmu' -> 'system',
Paolo Bonzini <=
- [PULL 06/26] travis-ci: Correct invalid mentions of 'softmmu' by 'system', Paolo Bonzini, 2023/10/06
- [PULL 17/26] system: Rename softmmu/ directory as system/, Paolo Bonzini, 2023/10/06
- [PULL 19/26] cutils: squelch compiler warnings with custom paths, Paolo Bonzini, 2023/10/06
- [PULL 20/26] audio: error hints need a trailing \n, Paolo Bonzini, 2023/10/06
- [PULL 18/26] configure: change $softmmu to $system, Paolo Bonzini, 2023/10/06
- [PULL 13/26] target/i386: Rename i386_softmmu_kvm_ss -> i386_kvm_ss, Paolo Bonzini, 2023/10/06
- [PULL 15/26] meson: Rename softmmu_mods -> system_mods, Paolo Bonzini, 2023/10/06
- [PULL 21/26] audio: disable default backends if -audio/-audiodev is used, Paolo Bonzini, 2023/10/06
- [PULL 23/26] audio: extend -audio to allow creating a default backend, Paolo Bonzini, 2023/10/06
- [PULL 24/26] audio: do not use first -audiodev as default audio device, Paolo Bonzini, 2023/10/06