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 <[email protected]>
Tested-by: Riku Voipio <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>
Message-id: 1403508500[email protected]
Signed-off-by: Peter Maydell <[email protected]>

diff --git a/include/sysemu/char.h b/include/sysemu/char.h
index 3b835f6fb383d0ba56684fbd9ef5b6cd0183323f..672ed39a3138988b1cd289d3c7bcf3b4d9381b2c 100644 (file)
--- 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 edbaa9b4754ede12c4c378e8bdc494e02c6d322b..845526ed019373a6afe8fa03c04429fe9b492d81 100644 (file)
--- 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 b3bd3b5af48d6861052b8b740746aa3cf06dbc7c..e4eb985b5746270ba65fc63308e47335cab002bf 100644 (file)
--- 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 2af054fe6b68bf434199c8021d3c05281120f110..308dfa08009dde21d51d34a6f8273979ce747014 100644 (file)
--- 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)
 {