Patchwork [1/3] block: allow interrupting a co_sleep_ns

login
register
mail settings
Submitter Paolo Bonzini
Date April 18, 2012, 1:12 p.m.
Message ID <1334754723-11153-2-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/153506/
State New
Headers show

Comments

Paolo Bonzini - April 18, 2012, 1:12 p.m.
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>
---
 qemu-coroutine-sleep.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Kevin Wolf - April 19, 2012, 1:54 p.m.
Am 18.04.2012 15:12, schrieb Paolo Bonzini:
> 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>

Thanks, applied this patch to the block branch. I'll wait for v2 for the
rest of the series.

Kevin

Patch

diff --git a/qemu-coroutine-sleep.c b/qemu-coroutine-sleep.c
index fd65274..d7083ee 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);
 }