From 077805fa92b9089137c6b6b196d449ee05cc342f Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 25 Sep 2012 10:04:17 +0200 Subject: janitor: do not rely on indirect inclusions of or from qemu-char.h Various header files rely on qemu-char.h including qemu-config.h or main-loop.h, but they really do not need qemu-char.h at all (particularly interesting is the case of the block layer!). Clean this up, and also add missing inclusions of qemu-char.h itself. Signed-off-by: Paolo Bonzini --- arch_init.c | 1 + audio/alsaaudio.c | 1 + audio/ossaudio.c | 1 + block/blkdebug.c | 1 + block/iscsi.c | 1 + bt-host.c | 1 + bt-vhci.c | 1 + event_notifier-posix.c | 1 + exec.c | 1 + hw/arm_boot.c | 1 + hw/dma.c | 1 + hw/fw_cfg.c | 1 + hw/jazz_led.c | 1 + hw/mac_dbdma.c | 1 + hw/ppc/e500.c | 1 + hw/puv3.c | 2 ++ hw/qdev-monitor.c | 1 + hw/qdev-properties.c | 1 + hw/s390x/sclpconsole.c | 1 + hw/spapr.c | 1 + hw/tcx.c | 1 + hw/usb/dev-network.c | 1 + net.c | 1 + qemu-config.h | 1 + spice-qemu-char.c | 1 + target-i386/kvm.c | 1 + 26 files changed, 27 insertions(+) diff --git a/arch_init.c b/arch_init.c index 1645f3079a..ef866cdea4 100644 --- a/arch_init.c +++ b/arch_init.c @@ -46,6 +46,7 @@ #include "exec-memory.h" #include "hw/pcspk.h" #include "qemu/page_cache.h" +#include "qemu-config.h" #include "qmp-commands.h" #include "trace.h" diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c index cb45b49c2a..564d632d0c 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -23,6 +23,7 @@ */ #include #include "qemu-common.h" +#include "main-loop.h" #include "qemu-char.h" #include "audio.h" diff --git a/audio/ossaudio.c b/audio/ossaudio.c index df51b7cc58..45abe39a6d 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -31,6 +31,7 @@ #include #endif #include "qemu-common.h" +#include "main-loop.h" #include "host-utils.h" #include "qemu-char.h" #include "audio.h" diff --git a/block/blkdebug.c b/block/blkdebug.c index 294e983306..65556e73e5 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -23,6 +23,7 @@ */ #include "qemu-common.h" +#include "qemu-config.h" #include "block_int.h" #include "module.h" diff --git a/block/iscsi.c b/block/iscsi.c index c0b70b3d32..33b93d8000 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -27,6 +27,7 @@ #include #include #include "qemu-common.h" +#include "qemu-config.h" #include "qemu-error.h" #include "block_int.h" #include "trace.h" diff --git a/bt-host.c b/bt-host.c index 0d3ad28e8c..8b47370b26 100644 --- a/bt-host.c +++ b/bt-host.c @@ -21,6 +21,7 @@ #include "qemu-char.h" #include "net.h" #include "bt-host.h" +#include "main-loop.h" #ifndef _WIN32 # include diff --git a/bt-vhci.c b/bt-vhci.c index bbc1029854..878460aeb5 100644 --- a/bt-vhci.c +++ b/bt-vhci.c @@ -21,6 +21,7 @@ #include "qemu-char.h" #include "net.h" #include "hw/bt.h" +#include "main-loop.h" #define VHCI_DEV "/dev/vhci" #define VHCI_UDEV "/dev/hci_vhci" diff --git a/event_notifier-posix.c b/event_notifier-posix.c index 6f3239a3fc..f0bd839acd 100644 --- a/event_notifier-posix.c +++ b/event_notifier-posix.c @@ -13,6 +13,7 @@ #include "qemu-common.h" #include "event_notifier.h" #include "qemu-char.h" +#include "main-loop.h" #ifdef CONFIG_EVENTFD #include diff --git a/exec.c b/exec.c index 4c1246a9f9..986084146c 100644 --- a/exec.c +++ b/exec.c @@ -33,6 +33,7 @@ #include "kvm.h" #include "hw/xen.h" #include "qemu-timer.h" +#include "qemu-config.h" #include "memory.h" #include "dma.h" #include "exec-memory.h" diff --git a/hw/arm_boot.c b/hw/arm_boot.c index ec3b8d5d12..63ff559cf7 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -15,6 +15,7 @@ #include "loader.h" #include "elf.h" #include "device_tree.h" +#include "qemu-config.h" #define KERNEL_ARGS_ADDR 0x100 #define KERNEL_LOAD_ADDR 0x00010000 diff --git a/hw/dma.c b/hw/dma.c index c2d7b21562..364f54d2d7 100644 --- a/hw/dma.c +++ b/hw/dma.c @@ -23,6 +23,7 @@ */ #include "hw.h" #include "isa.h" +#include "main-loop.h" /* #define DEBUG_DMA */ diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c index 2b92cda98a..7b0e50f70d 100644 --- a/hw/fw_cfg.c +++ b/hw/fw_cfg.c @@ -27,6 +27,7 @@ #include "fw_cfg.h" #include "sysbus.h" #include "qemu-error.h" +#include "qemu-config.h" /* debug firmware config */ //#define DEBUG_FW_CFG diff --git a/hw/jazz_led.c b/hw/jazz_led.c index 640e75ef2f..09c77429e8 100644 --- a/hw/jazz_led.c +++ b/hw/jazz_led.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu-common.h" #include "console.h" #include "pixel_ops.h" #include "trace.h" diff --git a/hw/mac_dbdma.c b/hw/mac_dbdma.c index e551156af9..41eee50a35 100644 --- a/hw/mac_dbdma.c +++ b/hw/mac_dbdma.c @@ -39,6 +39,7 @@ #include "hw.h" #include "isa.h" #include "mac_dbdma.h" +#include "main-loop.h" /* debug DBDMA */ //#define DEBUG_DBDMA diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 8fab508c07..2b1558b16e 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -19,6 +19,7 @@ #include "e500.h" #include "e500-ccsr.h" #include "net.h" +#include "qemu-config.h" #include "hw/hw.h" #include "hw/serial.h" #include "hw/pci/pci.h" diff --git a/hw/puv3.c b/hw/puv3.c index 3d7734936b..6f89c44e32 100644 --- a/hw/puv3.c +++ b/hw/puv3.c @@ -8,6 +8,8 @@ * published by the Free Software Foundation, or any later version. * See the COPYING file in the top-level directory. */ + +#include "qemu-common.h" #include "console.h" #include "elf.h" #include "exec-memory.h" diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index a1b4d6ae5f..5aaf74b98a 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -21,6 +21,7 @@ #include "monitor.h" #include "qmp-commands.h" #include "arch_init.h" +#include "qemu-config.h" /* * Aliases were a bad idea from the start. Let's keep them diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 81d901c6c4..b9cd3c0077 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -5,6 +5,7 @@ #include "hw/block-common.h" #include "net/hub.h" #include "qapi/qapi-visit-core.h" +#include "qemu-char.h" void *qdev_get_prop_ptr(DeviceState *dev, Property *prop) { diff --git a/hw/s390x/sclpconsole.c b/hw/s390x/sclpconsole.c index fece878e88..9ad297c999 100644 --- a/hw/s390x/sclpconsole.c +++ b/hw/s390x/sclpconsole.c @@ -17,6 +17,7 @@ #include "sclp.h" #include "event-facility.h" +#include "qemu-char.h" typedef struct ASCIIConsoleData { EventBufferHeader ebh; diff --git a/hw/spapr.c b/hw/spapr.c index 9bd2fd5c8c..7306ab368a 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -49,6 +49,7 @@ #include "exec-memory.h" #include "hw/usb.h" +#include "qemu-config.h" #include diff --git a/hw/tcx.c b/hw/tcx.c index 7aee2a9bd3..a66fbeefdb 100644 --- a/hw/tcx.c +++ b/hw/tcx.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu-common.h" #include "console.h" #include "pixel_ops.h" #include "sysbus.h" diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index 30cb03373e..0552e6f438 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -28,6 +28,7 @@ #include "hw/usb/desc.h" #include "net.h" #include "qemu-queue.h" +#include "qemu-config.h" #include "sysemu.h" #include "iov.h" diff --git a/net.c b/net.c index e8ae13e283..4f3d642468 100644 --- a/net.c +++ b/net.c @@ -32,6 +32,7 @@ #include "monitor.h" #include "qemu-common.h" #include "qemu_socket.h" +#include "qemu-config.h" #include "qmp-commands.h" #include "hw/qdev.h" #include "iov.h" diff --git a/qemu-config.h b/qemu-config.h index 812c4c5b10..eb50eca838 100644 --- a/qemu-config.h +++ b/qemu-config.h @@ -4,6 +4,7 @@ #include #include "qemu-option.h" #include "error.h" +#include "qemu-option.h" extern QemuOptsList qemu_fsdev_opts; extern QemuOptsList qemu_virtfs_opts; diff --git a/spice-qemu-char.c b/spice-qemu-char.c index 09aa22d566..5f95c937f3 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -1,6 +1,7 @@ #include "config-host.h" #include "trace.h" #include "ui/qemu-spice.h" +#include "qemu-char.h" #include #include diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 0901589a88..824930c749 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -27,6 +27,7 @@ #include "cpu.h" #include "gdbstub.h" #include "host-utils.h" +#include "qemu-config.h" #include "hw/pc.h" #include "hw/apic.h" #include "ioport.h" -- cgit v1.2.1