diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2009-09-10 10:58:46 +0200 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-09-11 10:19:48 -0500 |
commit | dc1c21e60c91bbfcbf73c84917581ff9490e7e22 (patch) | |
tree | 3384e1df7c0125cb6728d93a9753a9475f8836ac | |
parent | f0457e8d88a9ddcf7505f97cbeefd0673207713c (diff) | |
download | qemu-dc1c21e60c91bbfcbf73c84917581ff9490e7e22.zip qemu-dc1c21e60c91bbfcbf73c84917581ff9490e7e22.tar.gz qemu-dc1c21e60c91bbfcbf73c84917581ff9490e7e22.tar.bz2 |
convert braille chardev to QemuOpts.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r-- | hw/baum.c | 2 | ||||
-rw-r--r-- | hw/baum.h | 2 | ||||
-rw-r--r-- | qemu-char.c | 9 |
3 files changed, 6 insertions, 7 deletions
@@ -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; @@ -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 9c5fe57..345a9d6 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, @@ -2381,11 +2385,6 @@ CharDriverState *qemu_chr_open(const char *label, const char *filename, void (*i chr = qemu_chr_open_win_con(filename); } else #endif -#ifdef CONFIG_BRLAPI - if (!strcmp(filename, "braille")) { - chr = chr_baum_init(); - } else -#endif { chr = NULL; } |