summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-04-18 15:12:01 +0200
committerKevin Wolf <kwolf@redhat.com>2012-04-19 16:03:27 +0200
commit3ed9902528d0ffd244310014f7dcdcb3df3e2a04 (patch)
treec95c62db6dd68aa4de0be0c38024c1e52bcd0527
parent2795ecf681107d55e4113592b3045ece5f6e7b3b (diff)
downloadfocaccia-qemu-3ed9902528d0ffd244310014f7dcdcb3df3e2a04.tar.gz
focaccia-qemu-3ed9902528d0ffd244310014f7dcdcb3df3e2a04.zip
block: allow interrupting a co_sleep_ns
In the next patch we want to reenter the coroutine from
block_job_cancel_sync and cancel the timer.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--qemu-coroutine-sleep.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/qemu-coroutine-sleep.c b/qemu-coroutine-sleep.c
index fd65274446..d7083ee41a 100644
--- a/qemu-coroutine-sleep.c
+++ b/qemu-coroutine-sleep.c
@@ -23,7 +23,6 @@ static void co_sleep_cb(void *opaque)
 {
     CoSleepCB *sleep_cb = opaque;
 
-    qemu_free_timer(sleep_cb->ts);
     qemu_coroutine_enter(sleep_cb->co, NULL);
 }
 
@@ -35,4 +34,6 @@ void coroutine_fn co_sleep_ns(QEMUClock *clock, int64_t ns)
     sleep_cb.ts = qemu_new_timer(clock, SCALE_NS, co_sleep_cb, &sleep_cb);
     qemu_mod_timer(sleep_cb.ts, qemu_get_clock_ns(clock) + ns);
     qemu_coroutine_yield();
+    qemu_del_timer(sleep_cb.ts);
+    qemu_free_timer(sleep_cb.ts);
 }