From dc1c21e60c91bbfcbf73c84917581ff9490e7e22 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 10 Sep 2009 10:58:46 +0200 Subject: [PATCH] convert braille chardev to QemuOpts. Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori --- hw/baum.c | 2 +- hw/baum.h | 2 +- qemu-char.c | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/hw/baum.c b/hw/baum.c index b47ea34c4..a23e685d7 100644 --- a/hw/baum.c +++ b/hw/baum.c @@ -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; diff --git a/hw/baum.h b/hw/baum.h index ac34b3042..39ca4b12d 100644 --- a/hw/baum.h +++ b/hw/baum.h @@ -26,4 +26,4 @@ USBDevice *usb_baum_init(void); /* char device */ -CharDriverState *chr_baum_init(void); +CharDriverState *chr_baum_init(QemuOpts *opts); diff --git a/qemu-char.c b/qemu-char.c index 9c5fe57a5..345a9d6ef 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -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; -- 2.39.2