diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-03-17 18:16:21 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-06-22 18:20:41 +0200 |
| commit | a0b1a66ea39bca011108734147a72232a4d08c7a (patch) | |
| tree | 8d8eaeb0210b213cbb6d175f59aec7513ce80dfc /include | |
| parent | cc7a8ea740ec74a144e866a1d24aa6b490e31923 (diff) | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/block_int.h | 1 | ||||
| -rw-r--r-- | include/monitor/qdev.h | 2 | ||||
| -rw-r--r-- | include/sysemu/balloon.h | 1 | ||||
| -rw-r--r-- | include/ui/console.h | 2 | ||||
| -rw-r--r-- | include/ui/qemu-spice.h | 2 |
5 files changed, 2 insertions, 6 deletions
diff --git a/include/block/block_int.h b/include/block/block_int.h index a81542c9c2..b0476fc36e 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 dc796c8c6d..50ec2ffc12 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 0345e01efb..17fe30070d 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 9ad6c17ecc..047a2b4640 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 42db3c1645..0dff4229fc 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 |