diff options
| author | SeokYeon Hwang <syeon.hwang@samsung.com> | 2016-06-20 15:25:33 +0900 |
|---|---|---|
| committer | SeokYeon Hwang <syeon.hwang@samsung.com> | 2016-06-20 15:25:33 +0900 |
| commit | b5b5a72b01ac12c4dfb5867deb00c7b39f4fece5 (patch) | |
| tree | f28c18fd9706691e01dfbb9dd4d5b91b02bb78dd /main-loop.c | |
| parent | 00b7f2169caa54deb7f2e9d64908e7c6d2ff9d8e (diff) | |
| parent | bfc766d38e1fae5767d43845c15c79ac8fa6d6af (diff) | |
| download | qemu-b5b5a72b01ac12c4dfb5867deb00c7b39f4fece5.tar.gz qemu-b5b5a72b01ac12c4dfb5867deb00c7b39f4fece5.tar.bz2 qemu-b5b5a72b01ac12c4dfb5867deb00c7b39f4fece5.zip | |
Merge tag 'v2.6.0' into develop
v2.6.0 release
Change-Id: I76aaeae2ace35ddf6dbbd4c11436724688b01929
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Diffstat (limited to 'main-loop.c')
| -rw-r--r-- | main-loop.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main-loop.c b/main-loop.c index f94b865220..4e92ac8319 100644 --- a/main-loop.c +++ b/main-loop.c @@ -22,7 +22,9 @@ * THE SOFTWARE. */ -#include "qemu-common.h" +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/cutils.h" #include "qemu/timer.h" #include "qemu/sockets.h" // struct in_addr needed for libslirp.h #include "sysemu/qtest.h" @@ -510,7 +512,7 @@ int main_loop_wait(int nonblocking) /* CPU thread can infinitely wait for event after missing the warp */ - qemu_clock_warp(QEMU_CLOCK_VIRTUAL); + qemu_start_warp_timer(); qemu_clock_run_all_timers(); return ret; |