[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 14/23] convert braille chardev to QemuOpts.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v2 14/23] convert braille chardev to QemuOpts. |
Date: |
Thu, 10 Sep 2009 10:58:46 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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 b47ea34..a23e685 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 ac34b30..39ca4b1 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 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;
}
--
1.6.2.5
- [Qemu-devel] [PATCH v2 00/23] switch sockets+chardev to QemuOpts., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 04/23] convert file+pipe chardevs to QemuOpts., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 01/23] QemuOpts: split option parser into two functions., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 05/23] sockets: add unix_connect_opts, Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 03/23] switch chardev to QemuOpts: infrastructure, null device, Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 02/23] qemu-option.h include protectors, Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 06/23] sockets: add unix_listen_opts, Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 14/23] convert braille chardev to QemuOpts.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v2 08/23] sockets: add inet_connect_opts, Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 13/23] convert msmouse chardev to QemuOpts., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 12/23] convert stdio chardev to QemuOpts., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 11/23] convert pty chardev to QemuOpts., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 10/23] convert unix+tcp chardevs to QemuOpts., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 09/23] sockets: add inet_listen_opts, Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 15/23] convert windows console chardev to QemuOpts., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 21/23] qdev: add parser for chardev properties, Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 17/23] convert vc chardev to QemuOpts., Gerd Hoffmann, 2009/09/10
- [Qemu-devel] [PATCH v2 19/23] convert udp chardev to QemuOpts., Gerd Hoffmann, 2009/09/10