Merge branch 'upstream-1.7' into tizen_qemu_1.7

[sdk/emulator/qemu.git] / tizen / src / ecs / ecs.c

diff --git a/tizen/src/ecs/ecs.c b/tizen/src/ecs/ecs.c
index 7bbd271..67e921d 100644 (file)
--- a/tizen/src/ecs/ecs.c
+++ b/tizen/src/ecs/ecs.c
@@ -326,7 +326,7 @@ static void ecs_close(ECS_State *cs) {
     }
 
     if (cs->alive_timer != NULL) {
-        qemu_del_timer(cs->alive_timer);
+        timer_del(cs->alive_timer);
         cs->alive_timer = NULL;
     }
 
@@ -640,8 +640,8 @@ static void alive_checker(void *opaque) {
         return;
     }
 
-    qemu_mod_timer(current_ecs->alive_timer,
-            qemu_get_clock_ns(vm_clock) + get_ticks_per_sec() * TIMER_ALIVE_S);
+    timer_mod(current_ecs->alive_timer,
+            qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + get_ticks_per_sec() * TIMER_ALIVE_S);
 
 }
 
@@ -671,10 +671,10 @@ static int socket_initialize(ECS_State *cs, QemuOpts *opts) {
 
     make_keep_alive_msg();
 
-    cs->alive_timer = qemu_new_timer_ns(vm_clock, alive_checker, cs);
+    cs->alive_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, alive_checker, cs);
 
-    qemu_mod_timer(cs->alive_timer,
-            qemu_get_clock_ns(vm_clock) + get_ticks_per_sec() * TIMER_ALIVE_S);
+    timer_mod(cs->alive_timer,
+            qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + get_ticks_per_sec() * TIMER_ALIVE_S);
 
     return 0;
 }