commit 6a1751b7aad6e38e9d1ae6bcea72fa28bf6cc5fb
author Alex Bligh <alex@alex.org.uk> Wed Aug 21 16:02:47 2013 +0100
committer Stefan Hajnoczi <stefanha@redhat.com> Thu Aug 22 19:10:27 2013 +0200
tree e9323ec0742f142f26fcc79eecb76fdcc97ccd9d
parent ff83c66eccf5b5f6b6530d504e3be41559250dcb

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>

net/socket.c

diff --git a/net/socket.c b/net/socket.c
index 87af1d3..e61309d 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;