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 /net | |
| 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 'net')
| -rw-r--r-- | net/net.c | 1 | ||||
| -rw-r--r-- | net/socket.c | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -36,6 +36,7 @@ #include "qmp-commands.h" #include "hw/qdev.h" #include "qemu/iov.h" +#include "qemu/main-loop.h" #include "qapi-visit.h" #include "qapi/opts-visitor.h" #include "qapi/dealloc-visitor.h" diff --git a/net/socket.c b/net/socket.c index 87af1d3d39..e61309d8d5 100644 --- a/net/socket.c +++ b/net/socket.c @@ -31,6 +31,7 @@ #include "qemu/option.h" #include "qemu/sockets.h" #include "qemu/iov.h" +#include "qemu/main-loop.h" typedef struct NetSocketState { NetClientState nc; |