mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 23:33:54 -06:00
ui: Convert vnc_display_init(), init_keyboard_layout() to Error
Signed-off-by: Fei Li <fli@suse.com> Cc: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20181017082702.5581-27-armbru@redhat.com> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
f7b9e299a4
commit
ab4f931e9f
6 changed files with 24 additions and 18 deletions
6
ui/sdl.c
6
ui/sdl.c
|
@ -29,6 +29,7 @@
|
|||
#include <SDL.h>
|
||||
#include <SDL_syswm.h>
|
||||
|
||||
#include "qapi/error.h"
|
||||
#include "qemu-common.h"
|
||||
#include "qemu/cutils.h"
|
||||
#include "ui/console.h"
|
||||
|
@ -917,9 +918,8 @@ static void sdl1_display_init(DisplayState *ds, DisplayOptions *o)
|
|||
keyboard_layout = "en-us";
|
||||
#endif
|
||||
if(keyboard_layout) {
|
||||
kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout);
|
||||
if (!kbd_layout)
|
||||
exit(1);
|
||||
kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout,
|
||||
&error_fatal);
|
||||
}
|
||||
|
||||
g_printerr("Running QEMU with SDL 1.2 is deprecated, and will be removed\n"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue