summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2014-06-23 10:29:07 +0300
committerPeter Maydell <peter.maydell@linaro.org>2014-06-23 10:56:20 +0100
commit3840f8429043a9082696db99a7ccbc36cb72224c (patch)
tree57c6b0d992b9b572195842d7cedd72563979d8b4
parent427e1750a0b98a72cad424327604f51e993dcc5f (diff)
downloadhqemu-3840f8429043a9082696db99a7ccbc36cb72224c.zip
hqemu-3840f8429043a9082696db99a7ccbc36cb72224c.tar.gz
console: move chardev declarations to sysemu/char.h
move generic chardev APIs to sysemu/char.h, to make them available to callers which can not depend on the whole of ui/console.h. This fixes a build error on systems without pixman-devel: ./configure --disable-tools --disable-docs --target-list=arm-linux-user ... pixman none ... make ... In file included from /data/home/nchip/linaro/qemu/include/ui/console.h:4:0, from /data/home/nchip/linaro/qemu/stubs/vc-init.c:2: /data/home/nchip/linaro/qemu/include/ui/qemu-pixman.h:14:20: fatal error: pixman.h: No such file or directory #include <pixman.h> ^ compilation terminated. Reported-by: Riku Voipio <riku.voipio@iki.fi> Tested-by: Riku Voipio <riku.voipio@iki.fi> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Message-id: 1403508500-32691-1-git-send-email-mst@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--include/sysemu/char.h5
-rw-r--r--include/ui/console.h5
-rw-r--r--qemu-char.c1
-rw-r--r--stubs/vc-init.c2
4 files changed, 6 insertions, 7 deletions
diff --git a/include/sysemu/char.h b/include/sysemu/char.h
index 3b835f6..672ed39 100644
--- a/include/sysemu/char.h
+++ b/include/sysemu/char.h
@@ -350,4 +350,9 @@ CharDriverState *qemu_chr_open_msmouse(void);
/* baum.c */
CharDriverState *chr_baum_init(void);
+/* console.c */
+typedef CharDriverState *(VcHandler)(ChardevVC *vc);
+
+void register_vc_handler(VcHandler *handler);
+CharDriverState *vc_init(ChardevVC *vc);
#endif
diff --git a/include/ui/console.h b/include/ui/console.h
index edbaa9b..845526e 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -310,11 +310,6 @@ void qemu_console_copy(QemuConsole *con, int src_x, int src_y,
DisplaySurface *qemu_console_surface(QemuConsole *con);
DisplayState *qemu_console_displaystate(QemuConsole *console);
-typedef CharDriverState *(VcHandler)(ChardevVC *vc);
-
-CharDriverState *vc_init(ChardevVC *vc);
-void register_vc_handler(VcHandler *handler);
-
/* sdl.c */
void sdl_display_init(DisplayState *ds, int full_screen, int no_frame);
diff --git a/qemu-char.c b/qemu-char.c
index b3bd3b5..e4eb985 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -23,7 +23,6 @@
*/
#include "qemu-common.h"
#include "monitor/monitor.h"
-#include "ui/console.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
#include "sysemu/char.h"
diff --git a/stubs/vc-init.c b/stubs/vc-init.c
index 2af054f..308dfa0 100644
--- a/stubs/vc-init.c
+++ b/stubs/vc-init.c
@@ -1,5 +1,5 @@
#include "qemu-common.h"
-#include "ui/console.h"
+#include "sysemu/char.h"
CharDriverState *vc_init(ChardevVC *vc)
{
OpenPOWER on IntegriCloud