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>
This commit is contained in:
parent
427e1750a0
commit
3840f84290
@ -350,4 +350,9 @@ CharDriverState *qemu_chr_open_msmouse(void);
|
|||||||
/* baum.c */
|
/* baum.c */
|
||||||
CharDriverState *chr_baum_init(void);
|
CharDriverState *chr_baum_init(void);
|
||||||
|
|
||||||
|
/* console.c */
|
||||||
|
typedef CharDriverState *(VcHandler)(ChardevVC *vc);
|
||||||
|
|
||||||
|
void register_vc_handler(VcHandler *handler);
|
||||||
|
CharDriverState *vc_init(ChardevVC *vc);
|
||||||
#endif
|
#endif
|
||||||
|
@ -310,11 +310,6 @@ void qemu_console_copy(QemuConsole *con, int src_x, int src_y,
|
|||||||
DisplaySurface *qemu_console_surface(QemuConsole *con);
|
DisplaySurface *qemu_console_surface(QemuConsole *con);
|
||||||
DisplayState *qemu_console_displaystate(QemuConsole *console);
|
DisplayState *qemu_console_displaystate(QemuConsole *console);
|
||||||
|
|
||||||
typedef CharDriverState *(VcHandler)(ChardevVC *vc);
|
|
||||||
|
|
||||||
CharDriverState *vc_init(ChardevVC *vc);
|
|
||||||
void register_vc_handler(VcHandler *handler);
|
|
||||||
|
|
||||||
/* sdl.c */
|
/* sdl.c */
|
||||||
void sdl_display_init(DisplayState *ds, int full_screen, int no_frame);
|
void sdl_display_init(DisplayState *ds, int full_screen, int no_frame);
|
||||||
|
|
||||||
|
@ -23,7 +23,6 @@
|
|||||||
*/
|
*/
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "monitor/monitor.h"
|
#include "monitor/monitor.h"
|
||||||
#include "ui/console.h"
|
|
||||||
#include "sysemu/sysemu.h"
|
#include "sysemu/sysemu.h"
|
||||||
#include "qemu/timer.h"
|
#include "qemu/timer.h"
|
||||||
#include "sysemu/char.h"
|
#include "sysemu/char.h"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "ui/console.h"
|
#include "sysemu/char.h"
|
||||||
|
|
||||||
CharDriverState *vc_init(ChardevVC *vc)
|
CharDriverState *vc_init(ChardevVC *vc)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user