Skip to content

Commit

Permalink
Include monitor/monitor.h exactly where needed
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Markus Armbruster committed Jun 22, 2015
1 parent cc7a8ea commit a0b1a66
Show file tree
Hide file tree
Showing 30 changed files with 5 additions and 29 deletions.
2 changes: 1 addition & 1 deletion balloon.c
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion blockdev-nbd.c
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion hw/core/platform-bus.c
View file
Expand Up @@ -20,7 +20,6 @@
*/

#include "hw/platform-bus.h"
#include "monitor/monitor.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"

Expand Down
1 change: 0 additions & 1 deletion hw/display/qxl.c
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion hw/i386/pc.c
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion hw/ide/ahci.c
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion hw/ppc/spapr_vio.c
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion hw/s390x/event-facility.c
View file
Expand Up @@ -15,7 +15,6 @@
*
*/

#include "monitor/monitor.h"
#include "sysemu/sysemu.h"

#include "hw/s390x/sclp.h"
Expand Down
1 change: 0 additions & 1 deletion hw/s390x/s390-virtio-bus.c
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion hw/s390x/s390-virtio.c
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion hw/s390x/virtio-ccw.c
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion hw/usb/ccid-card-emulated.c
View file
Expand Up @@ -33,7 +33,6 @@

#include "qemu/thread.h"
#include "sysemu/char.h"
#include "monitor/monitor.h"
#include "ccid.h"

#define DPRINTF(card, lvl, fmt, ...) \
Expand Down
1 change: 0 additions & 1 deletion hw/usb/ccid-card-passthru.c
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion hw/usb/dev-serial.c
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion hw/usb/dev-smartcard-reader.c
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion hw/usb/hcd-ehci.h
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion hw/usb/redirect.c
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion include/block/block_int.h
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion include/monitor/qdev.h
View file
Expand Up @@ -2,7 +2,7 @@
#define QEMU_QDEV_MONITOR_H

#include "hw/qdev-core.h"
#include "monitor/monitor.h"
#include "qemu/typedefs.h"

/*** monitor commands ***/

Expand Down
1 change: 0 additions & 1 deletion include/sysemu/balloon.h
View file
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion include/ui/console.h
View file
Expand Up @@ -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"

Expand Down
2 changes: 0 additions & 2 deletions include/ui/qemu-spice.h
View file
Expand Up @@ -26,7 +26,6 @@

#include "qemu/option.h"
#include "qemu/config-file.h"
#include "monitor/monitor.h"

extern int using_spice;

Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion migration/migration.c
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion net/l2tpv3.c
View file
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions qmp.c
View file
Expand Up @@ -14,6 +14,7 @@
*/

#include "qemu-common.h"
#include "monitor/monitor.h"
#include "sysemu/sysemu.h"
#include "qmp-commands.h"
#include "sysemu/char.h"
Expand Down
1 change: 0 additions & 1 deletion target-s390x/kvm.c
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion tpm.c
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion ui/input-legacy.c
View file
Expand Up @@ -23,7 +23,6 @@
*/

#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
#include "ui/console.h"
#include "qapi/error.h"
#include "qmp-commands.h"
Expand Down
1 change: 0 additions & 1 deletion ui/spice-display.c
View file
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions ui/vnc-jobs.c
View file
Expand Up @@ -29,6 +29,7 @@
#include "vnc.h"
#include "vnc-jobs.h"
#include "qemu/sockets.h"
#include "block/aio.h"

/*
* Locking:
Expand Down

0 comments on commit a0b1a66

Please sign in to comment.