diff options
| author | Alex Bligh <alex@alex.org.uk> | 2013-08-21 16:02:47 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2013-08-22 19:10:27 +0200 |
| commit | 6a1751b7aad6e38e9d1ae6bcea72fa28bf6cc5fb (patch) | |
| tree | e9323ec0742f142f26fcc79eecb76fdcc97ccd9d /include | |
| parent | ff83c66eccf5b5f6b6530d504e3be41559250dcb (diff) | |
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')
| -rw-r--r-- | include/block/aio.h | 5 | ||||
| -rw-r--r-- | include/block/block_int.h | 1 | ||||
| -rw-r--r-- | include/block/coroutine.h | 1 | ||||
| -rw-r--r-- | include/qemu/timer.h | 1 | ||||
| -rw-r--r-- | include/qemu/typedefs.h | 2 |
5 files changed, 7 insertions, 3 deletions
diff --git a/include/block/aio.h b/include/block/aio.h index 5743bf1ba0..1e3ed1c347 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -14,6 +14,7 @@ #ifndef QEMU_AIO_H #define QEMU_AIO_H +#include "qemu/typedefs.h" #include "qemu-common.h" #include "qemu/queue.h" #include "qemu/event_notifier.h" @@ -42,7 +43,7 @@ typedef struct AioHandler AioHandler; typedef void QEMUBHFunc(void *opaque); typedef void IOHandler(void *opaque); -typedef struct AioContext { +struct AioContext { GSource source; /* The list of registered AIO handlers */ @@ -72,7 +73,7 @@ typedef struct AioContext { /* Thread pool for performing work and receiving completion callbacks */ struct ThreadPool *thread_pool; -} AioContext; +}; /** * aio_context_new: Allocate a new AioContext. diff --git a/include/block/block_int.h b/include/block/block_int.h index 74b06899d5..8012e253c9 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -34,6 +34,7 @@ #include "monitor/monitor.h" #include "qemu/hbitmap.h" #include "block/snapshot.h" +#include "qemu/main-loop.h" #define BLOCK_FLAG_ENCRYPT 1 #define BLOCK_FLAG_COMPAT6 4 diff --git a/include/block/coroutine.h b/include/block/coroutine.h index 1f2db3e8a4..17f5851e44 100644 --- a/include/block/coroutine.h +++ b/include/block/coroutine.h @@ -16,6 +16,7 @@ #define QEMU_COROUTINE_H #include <stdbool.h> +#include "qemu/typedefs.h" #include "qemu/queue.h" #include "qemu/timer.h" 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; |