summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2011-09-12 14:40:36 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2011-10-21 18:14:30 +0200
commita5c57d64aa61b700db444c4864a1da11f1165db6 (patch)
tree5cf057e28b7d531d146f5cac584ae65d9a2a34fc
parent946fb27c1dc158f10a6e3ce0374a161dce04c27b (diff)
downloadqemu-a5c57d64aa61b700db444c4864a1da11f1165db6.tar.gz
qemu-timer: do not refer to runstate_is_running()
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--cpus.c1
-rw-r--r--qemu-timer.c5
2 files changed, 2 insertions, 4 deletions
diff --git a/cpus.c b/cpus.c
index 21538e67da..1328baac70 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1059,6 +1059,7 @@ void pause_all_vcpus(void)
{
CPUState *penv = first_cpu;
+ qemu_clock_enable(vm_clock, false);
while (penv) {
penv->stop = 1;
qemu_cpu_kick(penv);
diff --git a/qemu-timer.c b/qemu-timer.c
index 8129af6ede..d8507e3e0f 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -504,10 +504,7 @@ void qemu_run_all_timers(void)
}
/* vm time timers */
- if (runstate_is_running()) {
- qemu_run_timers(vm_clock);
- }
-
+ qemu_run_timers(vm_clock);
qemu_run_timers(rt_clock);
qemu_run_timers(host_clock);
}