From 0b8fa32f551e863bb548a11394239239270dd3dc Mon Sep 17 00:00:00 2001
From: Markus Armbruster
Date: Thu, 23 May 2019 16:35:07 +0200
Subject: Include qemu/module.h where needed, drop it from qemu-common.h

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190523143508.25387-4-armbru@redhat.com>
[Rebased with conflicts resolved automatically, except for
hw/usb/dev-hub.c hw/misc/exynos4210_rng.c hw/misc/bcm2835_rng.c
hw/misc/aspeed_scu.c hw/display/virtio-vga.c hw/arm/stm32f205_soc.c;
ui/cocoa.m fixed up]
---
 io/channel-buffer.c  | 1 +
 io/channel-command.c | 1 +
 io/channel-file.c    | 1 +
 io/channel-socket.c  | 1 +
 io/channel-tls.c     | 1 +
 io/channel-websock.c | 1 +
 io/channel.c         | 1 +
 io/dns-resolver.c    | 1 +
 io/net-listener.c    | 1 +
 9 files changed, 9 insertions(+)

(limited to 'io')

diff --git a/io/channel-buffer.c b/io/channel-buffer.c
index 43d795976d..5402e0cced 100644
--- a/io/channel-buffer.c
+++ b/io/channel-buffer.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "io/channel-buffer.h"
 #include "io/channel-watch.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "trace.h"
 
diff --git a/io/channel-command.c b/io/channel-command.c
index 3e7eb17eff..368dd62b7e 100644
--- a/io/channel-command.c
+++ b/io/channel-command.c
@@ -22,6 +22,7 @@
 #include "io/channel-command.h"
 #include "io/channel-watch.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "trace.h"
 
diff --git a/io/channel-file.c b/io/channel-file.c
index db948abc3e..dac21f6012 100644
--- a/io/channel-file.c
+++ b/io/channel-file.c
@@ -22,6 +22,7 @@
 #include "io/channel-file.h"
 #include "io/channel-watch.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "trace.h"
 
diff --git a/io/channel-socket.c b/io/channel-socket.c
index bc5f80e780..d898cfcd47 100644
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/qapi-visit-sockets.h"
+#include "qemu/module.h"
 #include "io/channel-socket.h"
 #include "io/channel-watch.h"
 #include "trace.h"
diff --git a/io/channel-tls.c b/io/channel-tls.c
index c98ead21b0..7ec8ceff2f 100644
--- a/io/channel-tls.c
+++ b/io/channel-tls.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "io/channel-tls.h"
 #include "trace.h"
 
diff --git a/io/channel-websock.c b/io/channel-websock.c
index 77d30f0e4a..fc36d44eba 100644
--- a/io/channel-websock.c
+++ b/io/channel-websock.c
@@ -25,6 +25,7 @@
 #include "crypto/hash.h"
 #include "trace.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 
 /* Max amount to allow in rawinput/encoutput buffers */
 #define QIO_CHANNEL_WEBSOCK_MAX_BUFFER 8192
diff --git a/io/channel.c b/io/channel.c
index 2a26c2a2c0..e4376eb0bc 100644
--- a/io/channel.c
+++ b/io/channel.c
@@ -22,6 +22,7 @@
 #include "io/channel.h"
 #include "qapi/error.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/iov.h"
 
 bool qio_channel_has_feature(QIOChannel *ioc,
diff --git a/io/dns-resolver.c b/io/dns-resolver.c
index 187f725665..6ebe2a5650 100644
--- a/io/dns-resolver.c
+++ b/io/dns-resolver.c
@@ -25,6 +25,7 @@
 #include "qemu/sockets.h"
 #include "qapi/error.h"
 #include "qemu/cutils.h"
+#include "qemu/module.h"
 
 #ifndef AI_NUMERICSERV
 # define AI_NUMERICSERV 0
diff --git a/io/net-listener.c b/io/net-listener.c
index 3317aa6e5f..d8cfe52673 100644
--- a/io/net-listener.c
+++ b/io/net-listener.c
@@ -22,6 +22,7 @@
 #include "io/net-listener.h"
 #include "io/dns-resolver.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 QIONetListener *qio_net_listener_new(void)
 {
-- 
cgit v1.2.3-55-g7522