Include monitor/monitor.h exactly where needed

In particular, don't include it into headers.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>

diff --git a/balloon.c b/balloon.c
index 617187adf3c072e191f8b1bea1ae27a82224e8af..5d69e8a00b4873b416868d271b45f4e6a39af42e 100644 (file)
--- 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 944c1b69a72f64bb61bc5b1925c7042ec0291aa8..bcdd18b3f61620e39035fb798004b97fc8638b59 100644 (file)
--- 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 0f052b3338a728c02792eb3e2f00e263e4fc2115..70e051890190613f2cf0b3b723d7d5f1ccaa406d 100644 (file)
--- 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 722146ec3a9b8d84fe2a4295e7bf969ef72bfb9d..f87a5ee60244e6aaa31e2c1449928d6dccf74049 100644 (file)
--- 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 e715f7aacc162c4009c4ad0b4444b1d1bcabdfdf..7072930cfc3a3cf5b3c998d771f0e5df04f7d1e0 100644 (file)
--- 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 215c33f81c3b78dad54e4f718621d5dc96228f0a..b4b65c100a20f4d8056b3974eb466137bd36132b 100644 (file)
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -28,7 +28,6 @@
 #include <hw/sysbus.h>
 
 #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 174033dd41a34bfc5b13107172ede57b39b25f1c..8b59b64b7e1ece1e9dc2992a5ffe33b47a24b86d 100644 (file)
--- 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 1cb116a2975b18e3c6049669c5dd2ab4e38461d2..0c700effb114df30685c5d1c0efa19cc7fb66027 100644 (file)
--- 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 8a6e27eac18bd63b46bf6f350ae3c16b8574f1d7..77aec8a5bd2d6301c3fbb0e73cdebc4d90103669 100644 (file)
--- 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 4a67c3fc1eda8b737c4e13a9638ce46e36a24fb0..1284e77b22cfa175f61e2c250c456f4b9fce27b5 100644 (file)
--- 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 9d91780847b0864ea6ff0c7780d8628f0759d316..9605bf40b97a5b02ced3453aa0ff6c2d1831cfb8 100644 (file)
--- 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 aa1c37aabd4bbdd6d932c742fae00f78f47463a8..72329ed7d7031e3c8bb3ad99bf9cd62702cbed83 100644 (file)
--- 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 51f3e6adc44f56d589ec48b6b71ccb00a29a508f..85a4fc3e5333f6b60f35e8652bb451996ac4e24a 100644 (file)
--- 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 9c591f3a276f2a24220c8e45ed8d024689bf8a67..a6a66008ec35c1ffd5a06128a060ed25e1811711 100644 (file)
--- 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 2d29367ae76a7fe4452130f67008ce6f3b045487..de534bab372922689e9844c0d23b9bce1b3aa336 100644 (file)
--- 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 87b240f70a774bf27fbbd1123fb72604efc16be4..30218423c8cffb22b72543b02fced7cdb8da611f 100644 (file)
--- 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 4e9528e0abf03a8ba999895d00314ff77f761eef..25df25fd0f038127f72639bb345da17f8687d02d 100644 (file)
--- 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 a81542c9c26e4155d88ce30023ad20817c075329..b0476fc36ea10b008d09abdb0ce436dacfbcf762 100644 (file)
--- 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 dc796c8c6db4363fabf096041e7cb9cb28e73656..50ec2ffc123fabac3d1bce09199e520e0f92815e 100644 (file)
--- 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 0345e01efb54a7a03e86f0c62c98ca3807424cdd..17fe30070d715419800d7b6abcd4e70b8698b3fc 100644 (file)
--- 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 9ad6c17ecc2d482603da9881506543a9c3a525f5..047a2b46402e9ed4590ac07dc6e0a277a4262991 100644 (file)
--- 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 42db3c1645bdbbc308cae354c1112afdb0bb410d..0dff4229fc37f39e5b99add5ed1529f12fc15846 100644 (file)
--- 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 d7056d7453fb1f0c4f6c67377b1013fe68a9f398..c6ac08a0cbc6e1e78cd20938617c36265f27c2de 100644 (file)
--- 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 356dae2b722a940a251851b2ce1890f3786a908e..4f9bceecc9241d9ca7cd876cc125c99cbae2ebc2 100644 (file)
--- 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 03eba96193b2c283d06ad58697a1361b169e1e61..403805a5511750e19180bfacbe3bf3813c1ae0e5 100644 (file)
--- 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 b18946b440463f7f007fafba020706e890218ac8..135111a2c4b5cd10c9e65d5bce2bfd911706a550 100644 (file)
--- 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 5ca3eb5ed00523c3f72afc2390e8dcbd33765f47..4e9b109fba1d31ecb6f737dd5ba4b1545668db7a 100644 (file)
--- 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 3e9bb380e53800c4bc941c848db7d4ff9414fd32..e50f2968e1537e095c1ab9c6eb414e2803841dd3 100644 (file)
--- 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 cc4a6ce98deb75f2fbd742aaded1717f71ed53ea..0360abfd2ce22ddd5301cdda146007147cb68916 100644 (file)
--- 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 c8ee2034951021154453a2d0465ca0eea266e806..22c9abce55d1dac13fce6e2c964b5575edb66210 100644 (file)
--- 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: