exec: always use MADV_DONTFORK

[qemu.git] / qemu-coroutine-sleep.c

diff --git a/qemu-coroutine-sleep.c b/qemu-coroutine-sleep.c
index d7083ee41a4534fc574456967060bb03b4943444..f6db978c1dd467cd4b157635be967b850f014b96 100644 (file)
--- a/qemu-coroutine-sleep.c
+++ b/qemu-coroutine-sleep.c
@@ -11,8 +11,8 @@
  *
  */
 
  *
  */
 

-#include "qemu-coroutine.h"
-#include "qemu-timer.h"
+#include "block/coroutine.h"
+#include "qemu/timer.h"

 
 typedef struct CoSleepCB {
     QEMUTimer *ts;
 
 typedef struct CoSleepCB {
     QEMUTimer *ts;


@@ -26,14 +26,14 @@ static void co_sleep_cb(void *opaque)
     qemu_coroutine_enter(sleep_cb->co, NULL);
 }
 
     qemu_coroutine_enter(sleep_cb->co, NULL);
 }
 

-void coroutine_fn co_sleep_ns(QEMUClock *clock, int64_t ns)
+void coroutine_fn co_sleep_ns(QEMUClockType type, int64_t ns)

 {
     CoSleepCB sleep_cb = {
         .co = qemu_coroutine_self(),
     };
 {
     CoSleepCB sleep_cb = {
         .co = qemu_coroutine_self(),
     };

-    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);
+    sleep_cb.ts = timer_new(type, SCALE_NS, co_sleep_cb, &sleep_cb);
+    timer_mod(sleep_cb.ts, qemu_clock_get_ns(type) + ns);

     qemu_coroutine_yield();
     qemu_coroutine_yield();

-    qemu_del_timer(sleep_cb.ts);
-    qemu_free_timer(sleep_cb.ts);
+    timer_del(sleep_cb.ts);
+    timer_free(sleep_cb.ts);

 }
 }