summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-05-01 14:24:52 +0200
committerAndreas Färber <afaerber@suse.de>2013-06-28 13:25:12 +0200
commitcb446ecab714b2444a270be209e0533bcd2ee534 (patch)
tree8ca2d5167a7b9c64d1034ba15461df9ff136ddcb /monitor.c
parentdd1750d7981cf9e38985c9dfa474dcdbbe236270 (diff)
downloadqemu-cb446ecab714b2444a270be209e0533bcd2ee534.tar.gz
qemu-cb446ecab714b2444a270be209e0533bcd2ee534.tar.bz2
qemu-cb446ecab714b2444a270be209e0533bcd2ee534.zip
kvm: Change cpu_synchronize_state() argument to CPUState
Change Monitor::mon_cpu to CPUState as well. Reviewed-by: liguang <lig.fnst@cn.fujitsu.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/monitor.c b/monitor.c
index 70ae8f5b18..19c297d8c1 100644
--- a/monitor.c
+++ b/monitor.c
@@ -191,7 +191,7 @@ struct Monitor {
QString *outbuf;
ReadLineState *rs;
MonitorControl *mc;
- CPUArchState *mon_cpu;
+ CPUState *mon_cpu;
BlockDriverCompletionFunc *password_completion_cb;
void *password_opaque;
QError *error;
@@ -900,7 +900,7 @@ int monitor_set_cpu(int cpu_index)
if (cpu == NULL) {
return -1;
}
- cur_mon->mon_cpu = cpu->env_ptr;
+ cur_mon->mon_cpu = cpu;
return 0;
}
@@ -910,7 +910,7 @@ static CPUArchState *mon_get_cpu(void)
monitor_set_cpu(0);
}
cpu_synchronize_state(cur_mon->mon_cpu);
- return cur_mon->mon_cpu;
+ return cur_mon->mon_cpu->env_ptr;
}
int monitor_get_cpu_index(void)