Commit ab4f931e authored by Fei Li's avatar Fei Li Committed by Markus Armbruster
Browse files

ui: Convert vnc_display_init(), init_keyboard_layout() to Error 



Signed-off-by: default avatarFei Li <fli@suse.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20181017082702.5581-27-armbru@redhat.com>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent f7b9e299

include/ui/console.h

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ void qemu_display_early_init(DisplayOptions *opts); 
void qemu_display_init(DisplayState *ds, DisplayOptions *opts);



/* vnc.c */

void vnc_display_init(const char *id);

void vnc_display_init(const char *id, Error **errp);

void vnc_display_open(const char *id, Error **errp);

void vnc_display_add_client(const char *id, int csock, bool skipauth);

int vnc_display_password(const char *id, const char *password);

ui/curses.c

+3 −3
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <termios.h>

#endif



#include "qapi/error.h"

#include "qemu-common.h"

#include "ui/console.h"

#include "ui/input.h"
@@ -421,9 +422,8 @@ static void curses_keyboard_setup(void) 
        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);

    }

}

ui/keymaps.c

+6 −5
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "sysemu/sysemu.h"

#include "trace.h"

#include "qemu/error-report.h"

#include "qapi/error.h"



struct keysym2code {

    uint32_t count;
@@ -81,7 +82,7 @@ static void add_keysym(char *line, int keysym, int keycode, kbd_layout_t *k) 


static int parse_keyboard_layout(kbd_layout_t *k,

                                 const name2keysym_t *table,

                                 const char *language)

                                 const char *language, Error **errp)

{

    int ret;

    FILE *f;
@@ -95,7 +96,7 @@ static int parse_keyboard_layout(kbd_layout_t *k, 
    f = filename ? fopen(filename, "r") : NULL;

    g_free(filename);

    if (!f) {

        fprintf(stderr, "Could not read keymap file: '%s'\n", language);

        error_setg(errp, "could not read keymap file: '%s'", language);

        return -1;

    }
@@ -114,7 +115,7 @@ static int parse_keyboard_layout(kbd_layout_t *k, 
            continue;

        }

        if (!strncmp(line, "include ", 8)) {

            if (parse_keyboard_layout(k, table, line + 8) < 0) {

            if (parse_keyboard_layout(k, table, line + 8, errp) < 0) {

                ret = -1;

                goto out;

            }
@@ -172,13 +173,13 @@ out: 




kbd_layout_t *init_keyboard_layout(const name2keysym_t *table,

                                   const char *language)

                                   const char *language, Error **errp)

{

    kbd_layout_t *k;



    k = g_new0(kbd_layout_t, 1);

    k->hash = g_hash_table_new(NULL, NULL);

    if (parse_keyboard_layout(k, table, language) < 0) {

    if (parse_keyboard_layout(k, table, language, errp) < 0) {

        g_hash_table_unref(k->hash);

        g_free(k);

        return NULL;

ui/keymaps.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ typedef struct { 
typedef struct kbd_layout_t kbd_layout_t;



kbd_layout_t *init_keyboard_layout(const name2keysym_t *table,

                                   const char *language);

                                   const char *language, Error **errp);

int keysym2scancode(kbd_layout_t *k, int keysym,

                    bool shift, bool altgr, bool ctrl);

int keycode_is_keypad(kbd_layout_t *k, int keycode);

ui/sdl.c

+3 −3
Original line number Diff line number Diff line
@@ -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"