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]

11 files changed, 11 insertions, 0 deletions

diff --git a/hw/core/bus.c b/hw/core/bus.c
index 60c4720379..e6baa04e52 100644
--- a/hw/core/bus.c
+++ b/hw/core/bus.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/ctype.h"
+#include "qemu/module.h"
 #include "hw/qdev.h"
 #include "qapi/error.h"
 
diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c
index 239f78e2a7..c694532046 100644
--- a/hw/core/empty_slot.c
+++ b/hw/core/empty_slot.c
@@ -12,6 +12,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "hw/empty_slot.h"
 
 //#define DEBUG_EMPTY_SLOT
diff --git a/hw/core/fw-path-provider.c b/hw/core/fw-path-provider.c
index 33b99830e7..4840faefd1 100644
--- a/hw/core/fw-path-provider.c
+++ b/hw/core/fw-path-provider.c
@@ -17,6 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/fw-path-provider.h"
+#include "qemu/module.h"
 
 char *fw_path_provider_get_dev_path(FWPathProvider *p, BusState *bus,
                                     DeviceState *dev)
diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c
index 3695dd439c..79a493e577 100644
--- a/hw/core/generic-loader.c
+++ b/hw/core/generic-loader.c
@@ -36,6 +36,7 @@
 #include "sysemu/dma.h"
 #include "hw/loader.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/core/generic-loader.h"
 
 #define CPU_NONE 0xFFFFFFFF
diff --git a/hw/core/nmi.c b/hw/core/nmi.c
index bfd0896daf..481c4b3c7e 100644
--- a/hw/core/nmi.c
+++ b/hw/core/nmi.c
@@ -23,6 +23,7 @@
 #include "hw/nmi.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
+#include "qemu/module.h"
 #include "monitor/monitor.h"
 
 struct do_nmi_s {
diff --git a/hw/core/or-irq.c b/hw/core/or-irq.c
index a86901b673..123a8c644a 100644
--- a/hw/core/or-irq.c
+++ b/hw/core/or-irq.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/or-irq.h"
+#include "qemu/module.h"
 
 static void or_irq_handler(void *opaque, int n, int level)
 {
diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c
index e473a44746..5fecb29239 100644
--- a/hw/core/platform-bus.c
+++ b/hw/core/platform-bus.c
@@ -22,6 +22,7 @@
 #include "qemu/osdep.h"
 #include "hw/platform-bus.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 
 
diff --git a/hw/core/register.c b/hw/core/register.c
index d2d1636250..bb5ab9d479 100644
--- a/hw/core/register.c
+++ b/hw/core/register.c
@@ -19,6 +19,7 @@
 #include "hw/register.h"
 #include "hw/qdev.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 static inline void register_write_val(RegisterInfo *reg, uint64_t val)
 {
diff --git a/hw/core/split-irq.c b/hw/core/split-irq.c
index 7e64cd4969..c606f4a802 100644
--- a/hw/core/split-irq.c
+++ b/hw/core/split-irq.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/split-irq.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 static void split_irq_handler(void *opaque, int n, int level)
 {
diff --git a/hw/core/stream.c b/hw/core/stream.c
index 4439ecdf0b..39b1e595cd 100644
--- a/hw/core/stream.c
+++ b/hw/core/stream.c
@@ -1,5 +1,6 @@
 #include "qemu/osdep.h"
 #include "hw/stream.h"
+#include "qemu/module.h"
 
 size_t
 stream_push(StreamSlave *sink, uint8_t *buf, size_t len)
diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c
index 689a867a22..9e69c83aed 100644
--- a/hw/core/sysbus.c
+++ b/hw/core/sysbus.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/sysbus.h"
 #include "monitor/monitor.h"
 #include "exec/address-spaces.h"