summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-08-30 15:52:09 +0300
committerAvi Kivity <avi@redhat.com>2009-08-30 15:52:09 +0300
commit9c1257ac640c0e0ddd39d578666f36cac6f04e69 (patch)
treec7196c1f339563687d762182b5d9b82ddae383b7 /gdbstub.c
parentMerge commit '09aaa1602f9381c0e0fb539390b1793e51bdfc7b' into upstream-merge (diff)
parentkvm: Simplify cpu_synchronize_state() (diff)
downloadqemu-kvm-9c1257ac640c0e0ddd39d578666f36cac6f04e69.tar.gz
qemu-kvm-9c1257ac640c0e0ddd39d578666f36cac6f04e69.tar.bz2
qemu-kvm-9c1257ac640c0e0ddd39d578666f36cac6f04e69.zip
Merge commit '4c0960c0c483fffc5f8e1dab169d946ac295bf44' into upstream-merge
* commit '4c0960c0c483fffc5f8e1dab169d946ac295bf44': kvm: Simplify cpu_synchronize_state() Conflicts: hw/apic.c target-i386/machine.c Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'gdbstub.c')
-rw-r--r--gdbstub.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gdbstub.c b/gdbstub.c
index 622b2cc5b..c9304cd20 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -1569,8 +1569,8 @@ static void gdb_breakpoint_remove_all(void)
static void gdb_set_cpu_pc(GDBState *s, target_ulong pc)
{
#if defined(TARGET_I386)
+ cpu_synchronize_state(s->c_cpu);
s->c_cpu->eip = pc;
- cpu_synchronize_state(s->c_cpu, 1);
#elif defined (TARGET_PPC)
s->c_cpu->nip = pc;
#elif defined (TARGET_SPARC)
@@ -1756,7 +1756,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf)
}
break;
case 'g':
- cpu_synchronize_state(s->g_cpu, 0);
+ cpu_synchronize_state(s->g_cpu);
len = 0;
for (addr = 0; addr < num_g_regs; addr++) {
reg_size = gdb_read_register(s->g_cpu, mem_buf + len, addr);
@@ -1766,6 +1766,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf)
put_packet(s, buf);
break;
case 'G':
+ cpu_synchronize_state(s->g_cpu);
registers = mem_buf;
len = strlen(p) / 2;
hextomem((uint8_t *)registers, p, len);
@@ -1774,7 +1775,6 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf)
len -= reg_size;
registers += reg_size;
}
- cpu_synchronize_state(s->g_cpu, 1);
put_packet(s, "OK");
break;
case 'm':
@@ -1930,7 +1930,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf)
thread = strtoull(p+16, (char **)&p, 16);
env = find_cpu(thread);
if (env != NULL) {
- cpu_synchronize_state(env, 0);
+ cpu_synchronize_state(env);
len = snprintf((char *)mem_buf, sizeof(mem_buf),
"CPU#%d [%s]", env->cpu_index,
env->halted ? "halted " : "running");