[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/12 v12] make gdb_id() generally avialable and ren
From: |
Wen Congyang |
Subject: |
[Qemu-devel] [PATCH 10/12 v12] make gdb_id() generally avialable and rename it to cpu_index() |
Date: |
Wed, 18 Apr 2012 15:28:52 +0800 |
User-agent: |
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 |
The following patch also needs this API, so make it generally avialable.
The function gdb_id() will not be used in gdbstub.c now, so its name is
not suitable, and rename it to cpu_index()
Signed-off-by: Wen Congyang <address@hidden>
---
gdbstub.c | 19 +++++--------------
gdbstub.h | 9 +++++++++
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/gdbstub.c b/gdbstub.c
index 6a7e2c4..423ffec 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -1938,21 +1938,12 @@ static void gdb_set_cpu_pc(GDBState *s, target_ulong pc)
#endif
}
-static inline int gdb_id(CPUArchState *env)
-{
-#if defined(CONFIG_USER_ONLY) && defined(CONFIG_USE_NPTL)
- return env->host_tid;
-#else
- return env->cpu_index + 1;
-#endif
-}
-
static CPUArchState *find_cpu(uint32_t thread_id)
{
CPUArchState *env;
for (env = first_cpu; env != NULL; env = env->next_cpu) {
- if (gdb_id(env) == thread_id) {
+ if (cpu_index(env) == thread_id) {
return env;
}
}
@@ -1980,7 +1971,7 @@ static int gdb_handle_packet(GDBState *s, const char
*line_buf)
case '?':
/* TODO: Make this return the correct value for user-mode. */
snprintf(buf, sizeof(buf), "T%02xthread:%02x;", GDB_SIGNAL_TRAP,
- gdb_id(s->c_cpu));
+ cpu_index(s->c_cpu));
put_packet(s, buf);
/* Remove all the breakpoints when this query is issued,
* because gdb is doing and initial connect and the state
@@ -2275,7 +2266,7 @@ static int gdb_handle_packet(GDBState *s, const char
*line_buf)
} else if (strcmp(p,"sThreadInfo") == 0) {
report_cpuinfo:
if (s->query_cpu) {
- snprintf(buf, sizeof(buf), "m%x", gdb_id(s->query_cpu));
+ snprintf(buf, sizeof(buf), "m%x", cpu_index(s->query_cpu));
put_packet(s, buf);
s->query_cpu = s->query_cpu->next_cpu;
} else
@@ -2423,7 +2414,7 @@ static void gdb_vm_state_change(void *opaque, int
running, RunState state)
}
snprintf(buf, sizeof(buf),
"T%02xthread:%02x;%swatch:" TARGET_FMT_lx ";",
- GDB_SIGNAL_TRAP, gdb_id(env), type,
+ GDB_SIGNAL_TRAP, cpu_index(env), type,
env->watchpoint_hit->vaddr);
env->watchpoint_hit = NULL;
goto send_packet;
@@ -2456,7 +2447,7 @@ static void gdb_vm_state_change(void *opaque, int
running, RunState state)
ret = GDB_SIGNAL_UNKNOWN;
break;
}
- snprintf(buf, sizeof(buf), "T%02xthread:%02x;", ret, gdb_id(env));
+ snprintf(buf, sizeof(buf), "T%02xthread:%02x;", ret, cpu_index(env));
send_packet:
put_packet(s, buf);
diff --git a/gdbstub.h b/gdbstub.h
index b44e275..668de66 100644
--- a/gdbstub.h
+++ b/gdbstub.h
@@ -30,6 +30,15 @@ void gdb_register_coprocessor(CPUArchState *env,
gdb_reg_cb get_reg, gdb_reg_cb set_reg,
int num_regs, const char *xml, int g_pos);
+static inline int cpu_index(CPUArchState *env)
+{
+#if defined(CONFIG_USER_ONLY) && defined(CONFIG_USE_NPTL)
+ return env->host_tid;
+#else
+ return env->cpu_index + 1;
+#endif
+}
+
#endif
#ifdef CONFIG_USER_ONLY
--
1.7.1
- [Qemu-devel] [PATCH 00/12 v12] introducing a new, dedicated guest memory dump mechanism, Wen Congyang, 2012/04/18
- [Qemu-devel] [PATCH 01/12 v12] Add API to create memory mapping list, Wen Congyang, 2012/04/18
- [Qemu-devel] [PATCH 02/12 v12] Add API to check whether a physical address is I/O address, Wen Congyang, 2012/04/18
- [Qemu-devel] [PATCH 03/12 v12] implement cpu_get_memory_mapping(), Wen Congyang, 2012/04/18
- [Qemu-devel] [PATCH 04/12 v12] Add API to check whether paging mode is enabled, Wen Congyang, 2012/04/18
- [Qemu-devel] [PATCH 05/12 v12] Add API to get memory mapping, Wen Congyang, 2012/04/18
- [Qemu-devel] [PATCH 06/12 v12] Add API to get memory mapping without do paging, Wen Congyang, 2012/04/18
- [Qemu-devel] [PATCH 07/12 v12] target-i386: Add API to write elf notes to core file, Wen Congyang, 2012/04/18
- [Qemu-devel] [PATCH 08/12 v12] target-i386: Add API to write cpu status to core file, Wen Congyang, 2012/04/18
- [Qemu-devel] [PATCH 09/12 v12] target-i386: add API to get dump info, Wen Congyang, 2012/04/18
- [Qemu-devel] [PATCH 10/12 v12] make gdb_id() generally avialable and rename it to cpu_index(),
Wen Congyang <=
- [Qemu-devel] [PATCH 11/12 v12] QError: Introduce new error for the dump-guest-memory command, Wen Congyang, 2012/04/18
- [Qemu-devel] [PATCH 12/12 v12] introduce a new monitor command 'dump-guest-memory' to dump guest's memory, Wen Congyang, 2012/04/18
- Re: [Qemu-devel] [PATCH 12/12 v12] introduce a new monitor command 'dump-guest-memory' to dump guest's memory, Wen Congyang, 2012/04/18
- Re: [Qemu-devel] [PATCH 12/12 v12] introduce a new monitor command 'dump-guest-memory' to dump guest's memory, Daniel P. Berrange, 2012/04/18