From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 24/24] Include monitor/monitor.h exactly where needed
Date: Mon, 22 Jun 2015 21:04:49 +0200 [thread overview]
Message-ID: <1434999889-849-25-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1434999889-849-1-git-send-email-armbru@redhat.com>
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>
---
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 617187a..5d69e8a 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 944c1b6..bcdd18b 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 0f052b3..70e0518 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 722146e..f87a5ee 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 e715f7a..7072930 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 215c33f..b4b65c1 100644
--- 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 174033d..8b59b64 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 1cb116a..0c700ef 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 8a6e27e..77aec8a 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 4a67c3f..1284e77 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 9d91780..9605bf4 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 aa1c37a..72329ed 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 51f3e6a..85a4fc3 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 9c591f3..a6a6600 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 2d29367..de534ba 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 87b240f..3021842 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 4e9528e..25df25f 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 a81542c..b0476fc 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 dc796c8..50ec2ff 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 0345e01..17fe300 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 9ad6c17..047a2b4 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 42db3c1..0dff422 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 d7056d7..c6ac08a 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 356dae2..4f9bcee 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 03eba96..403805a 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 b18946b..135111a 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 5ca3eb5..4e9b109 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 3e9bb38..e50f296 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 cc4a6ce..0360abf 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 c8ee203..22c9abc 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:
--
1.9.3
next prev parent reply other threads:[~2015-06-22 19:05 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-22 19:04 [Qemu-devel] [PULL 00/24] Monitor patches Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 01/24] qobject: Use 'bool' for qbool Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 02/24] qobject: Use 'bool' inside qdict Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 03/24] monitor: remove debug prints Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 04/24] monitor: cleanup parsing of cmd name and cmd arguments Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 05/24] monitor: Point to "help" command on syntax error Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 06/24] monitor: Fix failure path for "S" argument Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 07/24] monitor: Split mon_get_cpu fn to remove ENV_GET_CPU Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 08/24] disas: Remove uses of CPU env Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 09/24] qdev-monitor: Stop error avalanche in qbus_find_recursive() Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 10/24] qdev-monitor: Fix check for full bus Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 11/24] qdev-monitor: Convert qbus_find() to Error Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 12/24] qdev-monitor: Propagate errors through set_property() Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 13/24] qdev-monitor: Propagate errors through qdev_device_add() Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 14/24] QemuOpts: Wean off qerror_report_err() Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 15/24] vl: Avoid qerror_report() outside QMP command handlers Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 16/24] vl: Use error_report() for --display errors Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 17/24] qerror: Eliminate QERR_DEVICE_NOT_FOUND Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 18/24] qerror: Clean up QERR_ macros to expand into a single string Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 19/24] tpm: Avoid qerror_report() outside QMP command handlers Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 20/24] qmp: Wean off qerror_report() Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 21/24] qerror: Finally unused, clean up Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 22/24] qerror: Move #include out of qerror.h Markus Armbruster
2015-06-22 19:04 ` [Qemu-devel] [PULL 23/24] Include qapi/qmp/qerror.h exactly where needed Markus Armbruster
2015-06-22 19:04 ` Markus Armbruster [this message]
2015-06-23 12:32 ` [Qemu-devel] [PULL 00/24] Monitor patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1434999889-849-25-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).