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>

diff --git a/dma-helpers.c b/dma-helpers.c
index 499550fc231af3bcc268d9c9e4958bd0b5345f2e..c9620a5bbd52ee8211b5f0faa8ab35690a60910d 100644 (file)
--- a/dma-helpers.c
+++ b/dma-helpers.c
@@ -11,6 +11,7 @@
 #include "trace.h"
 #include "qemu/range.h"
 #include "qemu/thread.h"
+#include "qemu/main-loop.h"
 
 /* #define DEBUG_IOMMU */
 

diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index a48e3baa99854c9be4bce496f15edbd6ba14b098..59e8e35a4c46fba92071f3ee3c2727f6866cf017 100644 (file)
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -27,6 +27,7 @@
 #include "hw/ptimer.h"
 #include "qemu/log.h"
 #include "qapi/qmp/qerror.h"
+#include "qemu/main-loop.h"
 
 #include "hw/stream.h"
 

diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
index acfea59779c04541ec0d3ee3f9060eba4d692d84..a47afde23af364e4404a7fdebb98d0333e404709 100644 (file)
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@@ -12,6 +12,7 @@
 #include "qemu-common.h"
 #include "hw/qdev.h"
 #include "hw/ptimer.h"
+#include "qemu/main-loop.h"
 
 /* Common timer implementation.  */
 

diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c
index a8009a4316bf1668116a65a3dddd01eb04b5510b..13b18894572a34dc250e452cf7989b1e56c40e93 100644 (file)
--- a/hw/timer/exynos4210_mct.c
+++ b/hw/timer/exynos4210_mct.c
@@ -54,6 +54,7 @@
 
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
+#include "qemu/main-loop.h"
 #include "qemu-common.h"
 #include "hw/ptimer.h"
 

diff --git a/hw/timer/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c
index a52f0f6c6b68a0afe7db26c51db015b2e0240b40..1aa8f4d07ac5ad13b8541e0985ae49d691b9ee0c 100644 (file)
--- a/hw/timer/exynos4210_pwm.c
+++ b/hw/timer/exynos4210_pwm.c
@@ -23,6 +23,7 @@
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "qemu-common.h"
+#include "qemu/main-loop.h"
 #include "hw/ptimer.h"
 
 #include "hw/arm/exynos4210.h"

diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c
index 7c1055a99c6667bc9cbcb6042ec75c7ef62a8960..74c16d6c9013183f94cbf9cd662976460d0930c6 100644 (file)
--- a/hw/timer/grlib_gptimer.c
+++ b/hw/timer/grlib_gptimer.c
@@ -25,6 +25,8 @@
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
+#include "qemu/timer.h"
+#include "qemu/main-loop.h"
 
 #include "trace.h"
 

diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c
index dc73d6525d899911475a78578bef5cb7fc4ba9b6..0dbe15c99b27a3262097d6d336875d48a0121df3 100644 (file)
--- a/hw/timer/imx_epit.c
+++ b/hw/timer/imx_epit.c
@@ -18,6 +18,7 @@
 #include "hw/ptimer.h"
 #include "hw/sysbus.h"
 #include "hw/arm/imx.h"
+#include "qemu/main-loop.h"
 
 #define TYPE_IMX_EPIT "imx.epit"
 

diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c
index 87db0e195c109a443e9074c706c014861c8e5e76..f2d1975e70a05da620554328f521a5222619245c 100644 (file)
--- a/hw/timer/imx_gpt.c
+++ b/hw/timer/imx_gpt.c
@@ -18,6 +18,7 @@
 #include "hw/ptimer.h"
 #include "hw/sysbus.h"
 #include "hw/arm/imx.h"
+#include "qemu/main-loop.h"
 
 #define TYPE_IMX_GPT "imx.gpt"
 

diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c
index 986e6a19d2cc57300fd447152e0710f8f6c4bf71..8ed138cc0eec364e25f985f27a888da935d7227a 100644 (file)
--- a/hw/timer/lm32_timer.c
+++ b/hw/timer/lm32_timer.c
@@ -27,6 +27,7 @@
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
 #include "qemu/error-report.h"
+#include "qemu/main-loop.h"
 
 #define DEFAULT_FREQUENCY (50*1000000)
 

diff --git a/hw/timer/puv3_ost.c b/hw/timer/puv3_ost.c
index 4bd2b76cb8ab9f80d3bfc097fafe9f63a93133f4..fa9eefd9256c8faead9298bb3d880a5c1703eb34 100644 (file)
--- a/hw/timer/puv3_ost.c
+++ b/hw/timer/puv3_ost.c
@@ -10,6 +10,7 @@
  */
 #include "hw/sysbus.h"
 #include "hw/ptimer.h"
+#include "qemu/main-loop.h"
 
 #undef DEBUG_PUV3
 #include "hw/unicore32/puv3.h"

diff --git a/hw/timer/sh_timer.c b/hw/timer/sh_timer.c
index 251a10dbfabdd515ff81b9120919b0b660d70158..07f0670b5d26487d67fee5ed58c920f0f71bfac9 100644 (file)
--- a/hw/timer/sh_timer.c
+++ b/hw/timer/sh_timer.c
@@ -11,6 +11,7 @@
 #include "hw/hw.h"
 #include "hw/sh4/sh.h"
 #include "qemu/timer.h"
+#include "qemu/main-loop.h"
 #include "exec/address-spaces.h"
 #include "hw/ptimer.h"
 

diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c
index 33e8f6c15c5a2b358cd43a9c2f896190c979bcf5..f75b91495136f6a613a623c577240e37a5e4c01c 100644 (file)
--- a/hw/timer/slavio_timer.c
+++ b/hw/timer/slavio_timer.c
@@ -27,6 +27,7 @@
 #include "hw/ptimer.h"
 #include "hw/sysbus.h"
 #include "trace.h"
+#include "qemu/main-loop.h"
 
 /*
  * Registers of hardware timer in sun4m.

diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c
index 5f2c9020ea6d7d0b33b3462d7cbd00a6e50fda10..6113b975bf856d3b1d8f5454ca607f49cd85d8b2 100644 (file)
--- a/hw/timer/xilinx_timer.c
+++ b/hw/timer/xilinx_timer.c
@@ -25,6 +25,7 @@
 #include "hw/sysbus.h"
 #include "hw/ptimer.h"
 #include "qemu/log.h"
+#include "qemu/main-loop.h"
 
 #define D(x)
 

diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index abe384ba9aafd48111b99588dc9085843713cf6f..6f0a4d28144213362ca690a3e0096691844d3222 100644 (file)
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -28,6 +28,7 @@
 #include "hw/pci/pci_ids.h"
 #include "tpm_tis.h"
 #include "qemu-common.h"
+#include "qemu/main-loop.h"
 
 /*#define DEBUG_TIS */
 

diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index ac8283313e20a6b6d1d1c298a00abcd79b830730..ec518833eafa95d541f01e49ef05e3b95902e014 100644 (file)
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -32,6 +32,7 @@
 #include "qemu/iov.h"
 #include "sysemu/dma.h"
 #include "trace.h"
+#include "qemu/main-loop.h"
 
 //#define DEBUG
 //#define DEBUG_DUMP_DATA

diff --git a/include/block/aio.h b/include/block/aio.h
index 5743bf1ba07a6cab671af59bc748a4bc881b0c71..1e3ed1c3472b77d00063ca1189e4dac734a443fb 100644 (file)
--- 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 74b06899d506d2b6bc1ab564d02f0bc7c37bddab..8012e253c9611785571de58f6583b771b246b430 100644 (file)
--- 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 1f2db3e8a4966dc8fb205aced4e0520255019e36..17f5851e44643f6b23d27296173fba4fa7033240 100644 (file)
--- 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 b4a7ba04ae53cbcf78a591deffcbdeaa8d2a983c..d4b643f20e058c2eff0e4c7b55ab78d762fb4b5e 100644 (file)
--- 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 ac9f8d41a357eadd51fc97f6fe45324b23503ae5..cae94ff57e672f1ca55ff9d8e491c41bb47b80df 100644 (file)
--- 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;

diff --git a/migration-exec.c b/migration-exec.c
index deab4e378e0c8578c8de461481f18fff0a0aea92..479024752f54ff4217dc2ccde4dfa3668cabb81b 100644 (file)
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -17,6 +17,7 @@
 
 #include "qemu-common.h"
 #include "qemu/sockets.h"
+#include "qemu/main-loop.h"
 #include "migration/migration.h"
 #include "migration/qemu-file.h"
 #include "block/block.h"

diff --git a/migration-fd.c b/migration-fd.c
index 3d4613cbaf5b2e2bfafd2b42dce303db4981bf33..d2e523af743f8662e25133455a0c8ec84e3814e8 100644 (file)
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -14,6 +14,7 @@
  */
 
 #include "qemu-common.h"
+#include "qemu/main-loop.h"
 #include "qemu/sockets.h"
 #include "migration/migration.h"
 #include "monitor/monitor.h"

diff --git a/migration-tcp.c b/migration-tcp.c
index b20ee58f558cb21758478cfac4baca68dee14615..782572de82923cbe69acd98de163629bae0d3831 100644 (file)
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -18,6 +18,7 @@
 #include "migration/migration.h"
 #include "migration/qemu-file.h"
 #include "block/block.h"
+#include "qemu/main-loop.h"
 
 //#define DEBUG_MIGRATION_TCP
 

diff --git a/migration-unix.c b/migration-unix.c
index 94b7022fc856d3564954120eca9d737155f39eb2..651fc5b707d7441b7094ec31b69e44581219107a 100644 (file)
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -15,6 +15,7 @@
 
 #include "qemu-common.h"
 #include "qemu/sockets.h"
+#include "qemu/main-loop.h"
 #include "migration/migration.h"
 #include "migration/qemu-file.h"
 #include "block/block.h"

diff --git a/migration.c b/migration.c
index 1402fa7680faf788db47a1d0e60e00e2d348da55..ac200ed31e63a4ddc2602ed44493fe4907402e7c 100644 (file)
--- a/migration.c
+++ b/migration.c
@@ -14,6 +14,7 @@
  */
 
 #include "qemu-common.h"
+#include "qemu/main-loop.h"
 #include "migration/migration.h"
 #include "monitor/monitor.h"
 #include "migration/qemu-file.h"

diff --git a/nbd.c b/nbd.c
index 2606403a41facd02d5b50d14dcd407b3aa62bd1c..0fd05836ca4c814eb6d32937891dce601362a12e 100644 (file)
--- a/nbd.c
+++ b/nbd.c
@@ -38,6 +38,7 @@
 
 #include "qemu/sockets.h"
 #include "qemu/queue.h"
+#include "qemu/main-loop.h"
 
 //#define DEBUG_NBD
 

diff --git a/net/net.c b/net/net.c
index c0d61bf78b1b63e32eb53da10f24ff1e363b4f5c..114859267eb680bb77e90d240c78a0ff42fdeff8 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -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 87af1d3d3962af07d5bce870974aa1194f168ff2..e61309d8d5ddd6eaa1371ed3724ba05e8048ca67 100644 (file)
--- 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;

diff --git a/qemu-coroutine-io.c b/qemu-coroutine-io.c
index c4df35a6403e06e60407737417c3efff7b90a20c..054ca70627e386198314deb616cfbf47b144619e 100644 (file)
--- a/qemu-coroutine-io.c
+++ b/qemu-coroutine-io.c
@@ -26,6 +26,7 @@
 #include "qemu/sockets.h"
 #include "block/coroutine.h"
 #include "qemu/iov.h"
+#include "qemu/main-loop.h"
 
 ssize_t coroutine_fn
 qemu_co_sendv_recvv(int sockfd, struct iovec *iov, unsigned iov_cnt,

diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index ffbcf31cfc6389e7b615bfc9529dc3e9629220f8..f91b6c4f0294fc1567d3b60234fc977fb17c4932 100644 (file)
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -10,6 +10,7 @@
 
 #include "qemu-io.h"
 #include "block/block_int.h"
+#include "qemu/main-loop.h"
 
 #define CMD_NOFILE_OK   0x01
 

diff --git a/qemu-nbd.c b/qemu-nbd.c
index 9c31d45706eeff4bc15d5908ff00c666db68a4a9..f044546c28469bc8f289cb3b72e1d50b10c1a57b 100644 (file)
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -19,6 +19,7 @@
 #include "qemu-common.h"
 #include "block/block.h"
 #include "block/nbd.h"
+#include "qemu/main-loop.h"
 
 #include <stdarg.h>
 #include <stdio.h>

diff --git a/slirp/misc.c b/slirp/misc.c
index 0bcc48193947a474f39fe413500c97d1582f54e4..c0d489950a371d8b61d077877f399f12ffe568ce 100644 (file)
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -9,6 +9,7 @@
 #include <libslirp.h>
 
 #include "monitor/monitor.h"
+#include "qemu/main-loop.h"
 
 #ifdef DEBUG
 int slirp_debug = DBG_CALL|DBG_MISC|DBG_ERROR;

diff --git a/thread-pool.c b/thread-pool.c
index 50255678172f7a161ad2793278fb7db480e805f6..3735fd34bc9ffc4a0a993897eb0632bf7b508f2e 100644 (file)
--- a/thread-pool.c
+++ b/thread-pool.c
@@ -23,6 +23,7 @@
 #include "block/block_int.h"
 #include "qemu/event_notifier.h"
 #include "block/thread-pool.h"
+#include "qemu/main-loop.h"
 
 static void do_spawn_thread(ThreadPool *pool);
 

diff --git a/ui/vnc-auth-sasl.h b/ui/vnc-auth-sasl.h
index 8091d689cbc9c19bc83f2abeb9f7f84ec53c1a84..3f59da67ebd9aa28bc25a8566105583f1d605217 100644 (file)
--- a/ui/vnc-auth-sasl.h
+++ b/ui/vnc-auth-sasl.h
@@ -33,6 +33,7 @@ typedef struct VncStateSASL VncStateSASL;
 typedef struct VncDisplaySASL VncDisplaySASL;
 
 #include "qemu/acl.h"
+#include "qemu/main-loop.h"
 
 struct VncStateSASL {
     sasl_conn_t *conn;

diff --git a/ui/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c
index c59b18860271f9a6e95d4a17a6406d0837b379fe..bc7032e6951fcfe7bb38683a8f7a624d6b3fb3d0 100644 (file)
--- a/ui/vnc-auth-vencrypt.c
+++ b/ui/vnc-auth-vencrypt.c
@@ -25,7 +25,7 @@
  */
 
 #include "vnc.h"
-
+#include "qemu/main-loop.h"
 
 static void start_auth_vencrypt_subauth(VncState *vs)
 {

diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
index df89315733aab42bfc391d5f6309e811bc2b3fa5..e304bafeb09ecf9f36fc07b694eaf0b1aad82656 100644 (file)
--- a/ui/vnc-ws.c
+++ b/ui/vnc-ws.c
@@ -19,6 +19,7 @@
  */
 
 #include "vnc.h"
+#include "qemu/main-loop.h"
 
 #ifdef CONFIG_VNC_TLS
 #include "qemu/sockets.h"