mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui/vc: console-vc requires PIXMAN

Browse Source 
Add stubs for the fallback paths.

get_vc() now returns NULL by default if !PIXMAN.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Marc-André Lureau 2023-08-30 13:38:28 +04:00
parent 1bec1cc0da
commit 600179c39e
3 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ui/console-vc-stubs.c Normal file
View File

@ -0,0 +1,33 @@
/*
* SPDX-License-Identifier: GPL-2.0-or-later
* QEMU VC stubs
*/
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/option.h"
#include "chardev/char.h"
#include "ui/console-priv.h"
void qemu_text_console_select(QemuTextConsole *c)
{
}
const char *
qemu_text_console_get_label(QemuTextConsole *c)
{
return NULL;
}
void qemu_text_console_update_cursor(void)
{
}
void qemu_text_console_handle_keysym(QemuTextConsole *s, int keysym)
{
}
void qemu_console_early_init(void)
{
}

3
ui/console.c
View File

@ -1685,8 +1685,11 @@ const char *qemu_display_get_vc(DisplayOptions *opts)
if (dpys[opts->type]->vc) {
return dpys[opts->type]->vc;
} else {
#ifdef CONFIG_PIXMAN
return "vc:80Cx24C";
#endif
}
return NULL;
}
void qemu_display_help(void)

2
ui/meson.build
View File

@ -6,7 +6,6 @@ system_ss.add(png)
system_ss.add(files(
'clipboard.c',
'console.c',
'console-vc.c',
'cursor.c',
'input-keymap.c',
'input-legacy.c',
@ -19,6 +18,7 @@ system_ss.add(files(
'ui-qmp-cmds.c',
'util.c',
))
system_ss.add(when: pixman, if_true: files('console-vc.c'), if_false: files('console-vc-stubs.c'))
if dbus_display
system_ss.add(files('dbus-module.c'))
endif