[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4.5 16/29] gdbstub: introduce gdb_get_max_cpus
From: |
Richard Henderson |
Subject: |
[PATCH v4.5 16/29] gdbstub: introduce gdb_get_max_cpus |
Date: |
Thu, 2 Mar 2023 18:57:52 -0800 |
From: Alex Bennée <alex.bennee@linaro.org>
This is needed for handling vcont packets as the way of calculating
max cpus vhanges between user and softmmu mode.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230302190846.2593720-17-alex.bennee@linaro.org>
---
gdbstub/internals.h | 1 +
gdbstub/gdbstub.c | 11 +----------
gdbstub/softmmu.c | 9 +++++++++
gdbstub/user.c | 17 +++++++++++++++++
4 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/gdbstub/internals.h b/gdbstub/internals.h
index d8c0292d99..26a6468a69 100644
--- a/gdbstub/internals.h
+++ b/gdbstub/internals.h
@@ -129,6 +129,7 @@ bool gdb_got_immediate_ack(void);
CPUState *gdb_first_attached_cpu(void);
void gdb_append_thread_id(CPUState *cpu, GString *buf);
int gdb_get_cpu_index(CPUState *cpu);
+unsigned int gdb_get_max_cpus(void); /* both */
void gdb_create_default_process(GDBState *s);
diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c
index ed38ab0aaa..1b783100c2 100644
--- a/gdbstub/gdbstub.c
+++ b/gdbstub/gdbstub.c
@@ -624,16 +624,7 @@ static int gdb_handle_vcont(const char *p)
GDBProcess *process;
CPUState *cpu;
GDBThreadIdKind kind;
-#ifdef CONFIG_USER_ONLY
- int max_cpus = 1; /* global variable max_cpus exists only in system mode */
-
- CPU_FOREACH(cpu) {
- max_cpus = max_cpus <= cpu->cpu_index ? cpu->cpu_index + 1 : max_cpus;
- }
-#else
- MachineState *ms = MACHINE(qdev_get_machine());
- unsigned int max_cpus = ms->smp.max_cpus;
-#endif
+ unsigned int max_cpus = gdb_get_max_cpus();
/* uninitialised CPUs stay 0 */
newstates = g_new0(char, max_cpus);
diff --git a/gdbstub/softmmu.c b/gdbstub/softmmu.c
index ab2d182654..3a5587d387 100644
--- a/gdbstub/softmmu.c
+++ b/gdbstub/softmmu.c
@@ -440,6 +440,15 @@ int gdb_target_memory_rw_debug(CPUState *cpu, hwaddr addr,
return cpu_memory_rw_debug(cpu, addr, buf, len, is_write);
}
+/*
+ * cpu helpers
+ */
+
+unsigned int gdb_get_max_cpus(void)
+{
+ MachineState *ms = MACHINE(qdev_get_machine());
+ return ms->smp.max_cpus;
+}
/*
* Softmmu specific command helpers
diff --git a/gdbstub/user.c b/gdbstub/user.c
index 92663d971c..e10988a62b 100644
--- a/gdbstub/user.c
+++ b/gdbstub/user.c
@@ -393,6 +393,23 @@ int gdb_target_memory_rw_debug(CPUState *cpu, hwaddr addr,
return cpu_memory_rw_debug(cpu, addr, buf, len, is_write);
}
+/*
+ * cpu helpers
+ */
+
+unsigned int gdb_get_max_cpus(void)
+{
+ CPUState *cpu;
+ unsigned int max_cpus = 1;
+
+ CPU_FOREACH(cpu) {
+ max_cpus = max_cpus <= cpu->cpu_index ? cpu->cpu_index + 1 : max_cpus;
+ }
+
+ return max_cpus;
+}
+
+
/*
* Break/Watch point helpers
*/
--
2.34.1
- [PATCH v4.5 02/29] gdbstub: fix-up copyright and license files, (continued)
- [PATCH v4.5 02/29] gdbstub: fix-up copyright and license files, Richard Henderson, 2023/03/02
- [PATCH v4.5 05/29] gdbstub: define separate user/system structures, Richard Henderson, 2023/03/02
- [PATCH v4.5 06/29] gdbstub: move GDBState to shared internals header, Richard Henderson, 2023/03/02
- [PATCH v4.5 08/29] gdbstub: move fromhex/tohex routines to internals, Richard Henderson, 2023/03/02
- [PATCH v4.5 09/29] gdbstub: make various helpers visible to the rest of the module, Richard Henderson, 2023/03/02
- [PATCH v4.5 10/29] gdbstub: move chunk of softmmu functionality to own file, Richard Henderson, 2023/03/02
- [PATCH v4.5 12/29] gdbstub: rationalise signal mapping in softmmu, Richard Henderson, 2023/03/02
- [PATCH v4.5 11/29] gdbstub: move chunks of user code into own files, Richard Henderson, 2023/03/02
- [PATCH v4.5 03/29] gdbstub: Make syscall_complete/[gs]et_reg target-agnostic typedefs, Richard Henderson, 2023/03/02
- [PATCH v4.5 04/29] gdbstub: clean-up indent on gdb_exit, Richard Henderson, 2023/03/02
- [PATCH v4.5 16/29] gdbstub: introduce gdb_get_max_cpus,
Richard Henderson <=
- [PATCH v4.5 13/29] gdbstub: abstract target specific details from gdb_put_packet_binary, Richard Henderson, 2023/03/02
- [PATCH v4.5 14/29] gdbstub: specialise handle_query_attached, Richard Henderson, 2023/03/02
- [PATCH v4.5 15/29] gdbstub: specialise target_memory_rw_debug, Richard Henderson, 2023/03/02
- [PATCH v4.5 07/29] includes: move tb_flush into its own header, Richard Henderson, 2023/03/02
- [PATCH v4.5 17/29] gdbstub: specialise stub_can_reverse, Richard Henderson, 2023/03/02
- [PATCH v4.5 19/29] gdbstub: don't use target_ulong while handling registers, Richard Henderson, 2023/03/02
- [PATCH v4.5 18/29] gdbstub: fix address type of gdb_set_cpu_pc, Richard Henderson, 2023/03/02
- [PATCH v4.5 20/29] gdbstub: move register helpers into standalone include, Richard Henderson, 2023/03/02
- [PATCH v4.5 22/29] gdbstub: only compile gdbstub twice for whole build, Richard Henderson, 2023/03/02
- [PATCH v4.5 21/29] gdbstub: move syscall handling to new file, Richard Henderson, 2023/03/02