From 0b8fa32f551e863bb548a11394239239270dd3dc Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@redhat.com>
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]
---
 hw/display/ads7846.c          | 1 +
 hw/display/ati.c              | 1 +
 hw/display/bcm2835_fb.c       | 1 +
 hw/display/bochs-display.c    | 2 ++
 hw/display/cg3.c              | 2 +-
 hw/display/cirrus_vga.c       | 2 ++
 hw/display/cirrus_vga_isa.c   | 1 +
 hw/display/dpcd.c             | 1 +
 hw/display/exynos4210_fimd.c  | 2 +-
 hw/display/g364fb.c           | 1 +
 hw/display/i2c-ddc.c          | 2 +-
 hw/display/jazz_led.c         | 2 +-
 hw/display/milkymist-tmu2.c   | 1 +
 hw/display/milkymist-vgafb.c  | 1 +
 hw/display/pl110.c            | 1 +
 hw/display/qxl.c              | 2 +-
 hw/display/ramfb-standalone.c | 1 +
 hw/display/sii9022.c          | 2 +-
 hw/display/sm501.c            | 2 +-
 hw/display/ssd0303.c          | 2 ++
 hw/display/ssd0323.c          | 2 ++
 hw/display/tcx.c              | 2 +-
 hw/display/vga-isa.c          | 2 ++
 hw/display/vga-pci.c          | 2 ++
 hw/display/virtio-gpu-pci.c   | 1 +
 hw/display/virtio-gpu.c       | 2 +-
 hw/display/virtio-vga.c       | 1 +
 hw/display/vmware_vga.c       | 2 ++
 hw/display/xlnx_dp.c          | 1 +
 29 files changed, 36 insertions(+), 9 deletions(-)

(limited to 'hw/display')

diff --git a/hw/display/ads7846.c b/hw/display/ads7846.c
index 166edade7d..1a97e97638 100644
--- a/hw/display/ads7846.c
+++ b/hw/display/ads7846.c
@@ -12,6 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/ssi/ssi.h"
+#include "qemu/module.h"
 #include "ui/console.h"
 
 typedef struct {
diff --git a/hw/display/ati.c b/hw/display/ati.c
index 75716dd944..76595d9511 100644
--- a/hw/display/ati.c
+++ b/hw/display/ati.c
@@ -21,6 +21,7 @@
 #include "ati_regs.h"
 #include "vga_regs.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c
index 599863e4e1..2311ec75b8 100644
--- a/hw/display/bcm2835_fb.c
+++ b/hw/display/bcm2835_fb.c
@@ -30,6 +30,7 @@
 #include "ui/pixel_ops.h"
 #include "hw/misc/bcm2835_mbox_defs.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define DEFAULT_VCRAM_SIZE 0x4000000
 #define BCM2835_FB_OFFSET  0x00100000
diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c
index 3d439eb240..0a2a3e27c4 100644
--- a/hw/display/bochs-display.c
+++ b/hw/display/bochs-display.c
@@ -4,7 +4,9 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/units.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
diff --git a/hw/display/cg3.c b/hw/display/cg3.c
index e50d97e48c..c6b7361be2 100644
--- a/hw/display/cg3.c
+++ b/hw/display/cg3.c
@@ -25,12 +25,12 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "ui/console.h"
 #include "hw/sysbus.h"
 #include "hw/loader.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 /* Change to 1 to enable debugging */
 #define DEBUG_CG3 0
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
index 76c052c702..2e4911a1e3 100644
--- a/hw/display/cirrus_vga.c
+++ b/hw/display/cirrus_vga.c
@@ -31,7 +31,9 @@
  *
  *  https://pdos.csail.mit.edu/6.828/2005/readings/hardware/vgadoc
  */
+
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "trace.h"
diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c
index fa10b74230..69cdb9e066 100644
--- a/hw/display/cirrus_vga_isa.c
+++ b/hw/display/cirrus_vga_isa.c
@@ -25,6 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 #include "hw/loader.h"
 #include "hw/isa/isa.h"
diff --git a/hw/display/dpcd.c b/hw/display/dpcd.c
index 943002bee5..88cde54821 100644
--- a/hw/display/dpcd.c
+++ b/hw/display/dpcd.c
@@ -28,6 +28,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/misc/auxbus.h"
 #include "hw/display/dpcd.h"
 
diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c
index 083b3172da..61f7408b1c 100644
--- a/hw/display/exynos4210_fimd.c
+++ b/hw/display/exynos4210_fimd.c
@@ -23,11 +23,11 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "hw/sysbus.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "qemu/bswap.h"
+#include "qemu/module.h"
 
 /* Debug messages configuration */
 #define EXYNOS4210_FIMD_DEBUG              0
diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c
index 3407adf98d..1774b4452e 100644
--- a/hw/display/g364fb.c
+++ b/hw/display/g364fb.c
@@ -21,6 +21,7 @@
 #include "qemu/units.h"
 #include "hw/hw.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "trace.h"
diff --git a/hw/display/i2c-ddc.c b/hw/display/i2c-ddc.c
index 9fe5403a92..041fc4f408 100644
--- a/hw/display/i2c-ddc.c
+++ b/hw/display/i2c-ddc.c
@@ -17,8 +17,8 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/i2c/i2c.h"
 #include "hw/display/i2c-ddc.h"
 
diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c
index eb7933d2a3..783189ebcd 100644
--- a/hw/display/jazz_led.c
+++ b/hw/display/jazz_led.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "trace.h"
diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c
index b33fc234e9..e1ed018b8f 100644
--- a/hw/display/milkymist-tmu2.c
+++ b/hw/display/milkymist-tmu2.c
@@ -30,6 +30,7 @@
 #include "trace.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/display/milkymist_tmu2.h"
 
diff --git a/hw/display/milkymist-vgafb.c b/hw/display/milkymist-vgafb.c
index 177fdac7d8..dce1dd7ad6 100644
--- a/hw/display/milkymist-vgafb.c
+++ b/hw/display/milkymist-vgafb.c
@@ -30,6 +30,7 @@
 #include "framebuffer.h"
 #include "ui/pixel_ops.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 #define BITS 8
 #include "milkymist-vgafb_template.h"
diff --git a/hw/display/pl110.c b/hw/display/pl110.c
index cf68457fd1..2bdfc3cc49 100644
--- a/hw/display/pl110.c
+++ b/hw/display/pl110.c
@@ -14,6 +14,7 @@
 #include "ui/pixel_ops.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define PL110_CR_EN   0x001
 #define PL110_CR_BGR  0x100
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 3880a7410b..98c7410032 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -23,10 +23,10 @@
 #include <zlib.h>
 
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/timer.h"
 #include "qemu/queue.h"
 #include "qemu/atomic.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 #include "migration/blocker.h"
 #include "trace.h"
diff --git a/hw/display/ramfb-standalone.c b/hw/display/ramfb-standalone.c
index 6441449e7b..56215ef88c 100644
--- a/hw/display/ramfb-standalone.c
+++ b/hw/display/ramfb-standalone.c
@@ -1,5 +1,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/loader.h"
 #include "hw/isa/isa.h"
 #include "hw/display/ramfb.h"
diff --git a/hw/display/sii9022.c b/hw/display/sii9022.c
index 9c36e4c17e..0bebb85a58 100644
--- a/hw/display/sii9022.c
+++ b/hw/display/sii9022.c
@@ -14,7 +14,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "hw/i2c/i2c.h"
 #include "hw/display/i2c-ddc.h"
 #include "trace.h"
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 1e2709b2d0..5918f59b2b 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -27,7 +27,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "cpu.h"
 #include "hw/hw.h"
 #include "hw/char/serial.h"
diff --git a/hw/display/ssd0303.c b/hw/display/ssd0303.c
index 8edf34986c..f2a60c44c9 100644
--- a/hw/display/ssd0303.c
+++ b/hw/display/ssd0303.c
@@ -10,8 +10,10 @@
 /* The controller can support a variety of different displays, but we only
    implement one.  Most of the commends relating to brightness and geometry
    setup are ignored. */
+
 #include "qemu/osdep.h"
 #include "hw/i2c/i2c.h"
+#include "qemu/module.h"
 #include "ui/console.h"
 
 //#define DEBUG_SSD0303 1
diff --git a/hw/display/ssd0323.c b/hw/display/ssd0323.c
index e182893157..ac373f1e78 100644
--- a/hw/display/ssd0323.c
+++ b/hw/display/ssd0323.c
@@ -10,8 +10,10 @@
 /* The controller can support a variety of different displays, but we only
    implement one.  Most of the commends relating to brightness and geometry
    setup are ignored. */
+
 #include "qemu/osdep.h"
 #include "hw/ssi/ssi.h"
+#include "qemu/module.h"
 #include "ui/console.h"
 
 //#define DEBUG_SSD0323 1
diff --git a/hw/display/tcx.c b/hw/display/tcx.c
index 66f2459226..bd5ac8f823 100644
--- a/hw/display/tcx.c
+++ b/hw/display/tcx.c
@@ -24,12 +24,12 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 #define TCX_ROM_FILE "QEMU,tcx.bin"
 #define FCODE_MAX_ROM_SIZE 0x10000
diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index fa44242e0d..945952a9b0 100644
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -23,11 +23,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "vga_int.h"
 #include "ui/pixel_ops.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/loader.h"
 
diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index a17c96e703..c66d9ec7ee 100644
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -23,11 +23,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "vga_int.h"
 #include "ui/pixel_ops.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/loader.h"
 #include "hw/display/edid.h"
diff --git a/hw/display/virtio-gpu-pci.c b/hw/display/virtio-gpu-pci.c
index 206870cd4c..d6f01b4a98 100644
--- a/hw/display/virtio-gpu-pci.c
+++ b/hw/display/virtio-gpu-pci.c
@@ -13,6 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/pci/pci.h"
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio-bus.h"
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 4a49da5ecb..2b0f66b1d6 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -13,7 +13,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "qemu-common.h"
 #include "qemu/iov.h"
 #include "ui/console.h"
 #include "trace.h"
@@ -25,6 +24,7 @@
 #include "hw/virtio/virtio-bus.h"
 #include "hw/display/edid.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 
diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index 67e34935c2..416e7fec87 100644
--- a/hw/display/virtio-vga.c
+++ b/hw/display/virtio-vga.c
@@ -3,6 +3,7 @@
 #include "hw/pci/pci.h"
 #include "hw/virtio/virtio-gpu.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "virtio-vga.h"
 
 static void virtio_vga_base_invalidate_display(void *opaque)
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index afbf1c5973..249a179bf6 100644
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -21,7 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c
index 11b09bd18c..cfd4c700b7 100644
--- a/hw/display/xlnx_dp.c
+++ b/hw/display/xlnx_dp.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/display/xlnx_dp.h"
 
 #ifndef DEBUG_DP
-- 
cgit v1.2.3