summary refs log tree commit diff stats
path: root/include/ui
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-03-17 18:16:21 +0100
committerMarkus Armbruster <armbru@redhat.com>2015-06-22 18:20:41 +0200
commita0b1a66ea39bca011108734147a72232a4d08c7a (patch)
tree8d8eaeb0210b213cbb6d175f59aec7513ce80dfc /include/ui
parentcc7a8ea740ec74a144e866a1d24aa6b490e31923 (diff)
downloadfocaccia-qemu-a0b1a66ea39bca011108734147a72232a4d08c7a.tar.gz
focaccia-qemu-a0b1a66ea39bca011108734147a72232a4d08c7a.zip
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/ui')
-rw-r--r--include/ui/console.h2
-rw-r--r--include/ui/qemu-spice.h2
2 files changed, 1 insertions, 3 deletions
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