From a0b1a66ea39bca011108734147a72232a4d08c7a Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 17 Mar 2015 18:16:21 +0100 Subject: [PATCH] Include monitor/monitor.h exactly where needed In particular, don't include it into headers. Signed-off-by: Markus Armbruster Reviewed-by: Stefan Hajnoczi Reviewed-by: Eric Blake Reviewed-by: Luiz Capitulino --- balloon.c | 2 +- blockdev-nbd.c | 1 - hw/core/platform-bus.c | 1 - hw/display/qxl.c | 1 - hw/i386/pc.c | 1 - hw/ide/ahci.c | 1 - hw/ppc/spapr_vio.c | 1 - hw/s390x/event-facility.c | 1 - hw/s390x/s390-virtio-bus.c | 1 - hw/s390x/s390-virtio.c | 1 - hw/s390x/virtio-ccw.c | 1 - hw/usb/ccid-card-emulated.c | 1 - hw/usb/ccid-card-passthru.c | 1 - hw/usb/dev-serial.c | 1 - hw/usb/dev-smartcard-reader.c | 1 - hw/usb/hcd-ehci.h | 1 - hw/usb/redirect.c | 1 - include/block/block_int.h | 1 - include/monitor/qdev.h | 2 +- include/sysemu/balloon.h | 1 - include/ui/console.h | 2 +- include/ui/qemu-spice.h | 2 -- migration/migration.c | 1 - net/l2tpv3.c | 1 - qmp.c | 1 + target-s390x/kvm.c | 1 - tpm.c | 1 - ui/input-legacy.c | 1 - ui/spice-display.c | 1 - ui/vnc-jobs.c | 1 + 30 files changed, 5 insertions(+), 29 deletions(-) diff --git a/balloon.c b/balloon.c index 617187adf3c0..5d69e8a00b48 100644 --- a/balloon.c +++ b/balloon.c @@ -24,7 +24,7 @@ * THE SOFTWARE. */ -#include "monitor/monitor.h" +#include "qemu-common.h" #include "exec/cpu-common.h" #include "sysemu/kvm.h" #include "sysemu/balloon.h" diff --git a/blockdev-nbd.c b/blockdev-nbd.c index 944c1b69a72f..bcdd18b3f616 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -12,7 +12,6 @@ #include "sysemu/blockdev.h" #include "sysemu/block-backend.h" #include "hw/block/block.h" -#include "monitor/monitor.h" #include "qapi/qmp/qerror.h" #include "sysemu/sysemu.h" #include "qmp-commands.h" diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c index 0f052b3338a7..70e051890190 100644 --- a/hw/core/platform-bus.c +++ b/hw/core/platform-bus.c @@ -20,7 +20,6 @@ */ #include "hw/platform-bus.h" -#include "monitor/monitor.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 722146ec3a9b..f87a5ee60244 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -25,7 +25,6 @@ #include "qemu/timer.h" #include "qemu/queue.h" #include "qemu/atomic.h" -#include "monitor/monitor.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index e715f7aacc16..7072930cfc3a 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -31,7 +31,6 @@ #include "hw/ide.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" -#include "monitor/monitor.h" #include "hw/nvram/fw_cfg.h" #include "hw/timer/hpet.h" #include "hw/i386/smbios.h" diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 215c33f81c3b..b4b65c100a20 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -28,7 +28,6 @@ #include #include "qemu/error-report.h" -#include "monitor/monitor.h" #include "sysemu/block-backend.h" #include "sysemu/dma.h" #include "internal.h" diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 174033dd41a3..8b59b64b7e1e 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -22,7 +22,6 @@ #include "hw/hw.h" #include "sysemu/sysemu.h" #include "hw/boards.h" -#include "monitor/monitor.h" #include "hw/loader.h" #include "elf.h" #include "hw/sysbus.h" diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 1cb116a2975b..0c700effb114 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -15,7 +15,6 @@ * */ -#include "monitor/monitor.h" #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index 8a6e27eac18b..77aec8a5bd2d 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -21,7 +21,6 @@ #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" #include "hw/boards.h" -#include "monitor/monitor.h" #include "hw/loader.h" #include "elf.h" #include "hw/virtio/virtio.h" diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index 4a67c3fc1eda..1284e77b22cf 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -28,7 +28,6 @@ #include "sysemu/sysemu.h" #include "net/net.h" #include "hw/boards.h" -#include "monitor/monitor.h" #include "hw/loader.h" #include "hw/virtio/virtio.h" #include "hw/sysbus.h" diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 9d91780847b0..9605bf40b97a 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -15,7 +15,6 @@ #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "net/net.h" -#include "monitor/monitor.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-serial.h" #include "hw/virtio/virtio-net.h" diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index aa1c37aabd4b..72329ed7d703 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -33,7 +33,6 @@ #include "qemu/thread.h" #include "sysemu/char.h" -#include "monitor/monitor.h" #include "ccid.h" #define DPRINTF(card, lvl, fmt, ...) \ diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 51f3e6adc44f..85a4fc3e5333 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -11,7 +11,6 @@ #include "sysemu/char.h" #include "qemu/error-report.h" #include "qemu/sockets.h" -#include "monitor/monitor.h" #include "ccid.h" #include "libcacard/vscard_common.h" diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 9c591f3a276f..a6a66008ec35 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -10,7 +10,6 @@ #include "qemu-common.h" #include "qemu/error-report.h" -#include "monitor/monitor.h" #include "hw/usb.h" #include "hw/usb/desc.h" #include "sysemu/char.h" diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 2d29367ae76a..de534bab3729 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -38,7 +38,6 @@ #include "qemu/error-report.h" #include "hw/usb.h" #include "hw/usb/desc.h" -#include "monitor/monitor.h" #include "ccid.h" diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h index 87b240f70a77..30218423c8cf 100644 --- a/hw/usb/hcd-ehci.h +++ b/hw/usb/hcd-ehci.h @@ -20,7 +20,6 @@ #include "hw/hw.h" #include "qemu/timer.h" #include "hw/usb.h" -#include "monitor/monitor.h" #include "sysemu/dma.h" #include "sysemu/sysemu.h" #include "hw/pci/pci.h" diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 4e9528e0abf0..25df25fd0f03 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -27,7 +27,6 @@ #include "qemu-common.h" #include "qemu/timer.h" -#include "monitor/monitor.h" #include "sysemu/sysemu.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" diff --git a/include/block/block_int.h b/include/block/block_int.h index a81542c9c26e..b0476fc36ea1 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -31,7 +31,6 @@ #include "block/coroutine.h" #include "qemu/timer.h" #include "qapi-types.h" -#include "monitor/monitor.h" #include "qemu/hbitmap.h" #include "block/snapshot.h" #include "qemu/main-loop.h" diff --git a/include/monitor/qdev.h b/include/monitor/qdev.h index dc796c8c6db4..50ec2ffc123f 100644 --- a/include/monitor/qdev.h +++ b/include/monitor/qdev.h @@ -2,7 +2,7 @@ #define QEMU_QDEV_MONITOR_H #include "hw/qdev-core.h" -#include "monitor/monitor.h" +#include "qemu/typedefs.h" /*** monitor commands ***/ diff --git a/include/sysemu/balloon.h b/include/sysemu/balloon.h index 0345e01efb54..17fe30070d71 100644 --- a/include/sysemu/balloon.h +++ b/include/sysemu/balloon.h @@ -14,7 +14,6 @@ #ifndef _QEMU_BALLOON_H #define _QEMU_BALLOON_H -#include "monitor/monitor.h" #include "qapi-types.h" typedef void (QEMUBalloonEvent)(void *opaque, ram_addr_t target); diff --git a/include/ui/console.h b/include/ui/console.h index 9ad6c17ecc2d..047a2b46402e 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -5,7 +5,7 @@ #include "qom/object.h" #include "qapi/qmp/qdict.h" #include "qemu/notify.h" -#include "monitor/monitor.h" +#include "qemu/typedefs.h" #include "qapi-types.h" #include "qapi/error.h" diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h index 42db3c1645bd..0dff4229fc37 100644 --- a/include/ui/qemu-spice.h +++ b/include/ui/qemu-spice.h @@ -26,7 +26,6 @@ #include "qemu/option.h" #include "qemu/config-file.h" -#include "monitor/monitor.h" extern int using_spice; @@ -54,7 +53,6 @@ static inline CharDriverState *qemu_chr_open_spice_port(const char *name) #endif #else /* CONFIG_SPICE */ -#include "monitor/monitor.h" #define using_spice 0 #define spice_displays 0 diff --git a/migration/migration.c b/migration/migration.c index d7056d7453fb..c6ac08a0cbc6 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -17,7 +17,6 @@ #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "migration/migration.h" -#include "monitor/monitor.h" #include "migration/qemu-file.h" #include "sysemu/sysemu.h" #include "block/block.h" diff --git a/net/l2tpv3.c b/net/l2tpv3.c index 356dae2b722a..4f9bceecc924 100644 --- a/net/l2tpv3.c +++ b/net/l2tpv3.c @@ -28,7 +28,6 @@ #include "config-host.h" #include "net/net.h" #include "clients.h" -#include "monitor/monitor.h" #include "qemu-common.h" #include "qemu/error-report.h" #include "qemu/option.h" diff --git a/qmp.c b/qmp.c index 03eba96193b2..403805a55117 100644 --- a/qmp.c +++ b/qmp.c @@ -14,6 +14,7 @@ */ #include "qemu-common.h" +#include "monitor/monitor.h" #include "sysemu/sysemu.h" #include "qmp-commands.h" #include "sysemu/char.h" diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index b18946b44046..135111a2c4b5 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -37,7 +37,6 @@ #include "cpu.h" #include "sysemu/device_tree.h" #include "qapi/qmp/qjson.h" -#include "monitor/monitor.h" #include "exec/gdbstub.h" #include "exec/address-spaces.h" #include "trace.h" diff --git a/tpm.c b/tpm.c index 5ca3eb5ed005..4e9b109fba1d 100644 --- a/tpm.c +++ b/tpm.c @@ -13,7 +13,6 @@ */ #include "config-host.h" -#include "monitor/monitor.h" #include "qapi/qmp/qerror.h" #include "sysemu/tpm_backend.h" #include "sysemu/tpm.h" diff --git a/ui/input-legacy.c b/ui/input-legacy.c index 3e9bb380e538..e50f2968e153 100644 --- a/ui/input-legacy.c +++ b/ui/input-legacy.c @@ -23,7 +23,6 @@ */ #include "sysemu/sysemu.h" -#include "monitor/monitor.h" #include "ui/console.h" #include "qapi/error.h" #include "qmp-commands.h" diff --git a/ui/spice-display.c b/ui/spice-display.c index cc4a6ce98deb..0360abfd2ce2 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -19,7 +19,6 @@ #include "ui/qemu-spice.h" #include "qemu/timer.h" #include "qemu/queue.h" -#include "monitor/monitor.h" #include "ui/console.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c index c8ee20349510..22c9abce55d1 100644 --- a/ui/vnc-jobs.c +++ b/ui/vnc-jobs.c @@ -29,6 +29,7 @@ #include "vnc.h" #include "vnc-jobs.h" #include "qemu/sockets.h" +#include "block/aio.h" /* * Locking: