Commit dc1c21e6 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Anthony Liguori
Browse files

convert braille chardev to QemuOpts. 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent f0457e8d

hw/baum.c

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ static void baum_chr_read(void *opaque) 
    }

}



CharDriverState *chr_baum_init(void)

CharDriverState *chr_baum_init(QemuOpts *opts)

{

    BaumDriverState *baum;

    CharDriverState *chr;

hw/baum.h

+1 −1
Original line number Diff line number Diff line
@@ -26,4 +26,4 @@ 
USBDevice *usb_baum_init(void);



/* char device */

CharDriverState *chr_baum_init(void);
 
CharDriverState *chr_baum_init(QemuOpts *opts);

qemu-char.c

+4 −5
Original line number Diff line number Diff line
@@ -2229,6 +2229,7 @@ static QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename) 
    if (strcmp(filename, "null")    == 0 ||

        strcmp(filename, "pty")     == 0 ||

        strcmp(filename, "msmouse") == 0 ||

        strcmp(filename, "braille") == 0 ||

        strcmp(filename, "stdio")   == 0) {

        qemu_opt_set(opts, "backend", filename);

        return opts;
@@ -2290,6 +2291,9 @@ static const struct { 
    { .name = "pty",       .open = qemu_chr_open_pty },

    { .name = "stdio",     .open = qemu_chr_open_stdio },

#endif

#ifdef CONFIG_BRLAPI

    { .name = "braille",   .open = chr_baum_init },

#endif

};



CharDriverState *qemu_chr_open_opts(QemuOpts *opts,
@@ -2380,11 +2384,6 @@ CharDriverState *qemu_chr_open(const char *label, const char *filename, void (*i 
    if (strstart(filename, "con:", NULL)) {

        chr = qemu_chr_open_win_con(filename);

    } else

#endif

#ifdef CONFIG_BRLAPI

    if (!strcmp(filename, "braille")) {

        chr = chr_baum_init();

    } else

#endif

    {

        chr = NULL;