diff options
| author | Alex Bligh | 2013-08-21 17:02:47 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi | 2013-08-22 19:10:27 +0200 |
| commit | 6a1751b7aad6e38e9d1ae6bcea72fa28bf6cc5fb (patch) | |
| tree | e9323ec0742f142f26fcc79eecb76fdcc97ccd9d /include/qemu | |
| parent | aio / timers: Split QEMUClock into QEMUClock and QEMUTimerList (diff) | |
| download | qemu-6a1751b7aad6e38e9d1ae6bcea72fa28bf6cc5fb.tar.gz qemu-6a1751b7aad6e38e9d1ae6bcea72fa28bf6cc5fb.tar.xz qemu-6a1751b7aad6e38e9d1ae6bcea72fa28bf6cc5fb.zip | |
aio / timers: Untangle include files
include/qemu/timer.h has no need to include main-loop.h and
doing so causes an issue for the next patch. Unfortunately
various files assume including timers.h will pull in main-loop.h.
Untangle this mess.
Signed-off-by: Alex Bligh <alex@alex.org.uk>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'include/qemu')
| -rw-r--r-- | include/qemu/timer.h | 1 | ||||
| -rw-r--r-- | include/qemu/typedefs.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/qemu/timer.h b/include/qemu/timer.h index b4a7ba04ae..d4b643f20e 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -3,7 +3,6 @@ #include "qemu/typedefs.h" #include "qemu-common.h" -#include "qemu/main-loop.h" #include "qemu/notify.h" /* timers */ diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index ac9f8d41a3..cae94ff57e 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -7,6 +7,8 @@ typedef struct QEMUTimer QEMUTimer; typedef struct QEMUFile QEMUFile; typedef struct QEMUBH QEMUBH; +typedef struct AioContext AioContext; + struct Monitor; typedef struct Monitor Monitor; typedef struct MigrationParams MigrationParams; |