[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/14] qemu-char: add -chardev mux support
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 11/14] qemu-char: add -chardev mux support |
Date: |
Fri, 28 Jun 2013 22:17:42 +0400 |
From: Gerd Hoffmann <address@hidden>
Allow to explicitly create mux chardevs on the command line,
like you can using QMP.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
qemu-char.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/qemu-char.c b/qemu-char.c
index 392de29..c097ca1 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3115,6 +3115,19 @@ static void qemu_chr_parse_memory(QemuOpts *opts,
ChardevBackend *backend,
}
}
+static void qemu_chr_parse_mux(QemuOpts *opts, ChardevBackend *backend,
+ Error **errp)
+{
+ const char *chardev = qemu_opt_get(opts, "chardev");
+
+ if (chardev == NULL) {
+ error_setg(errp, "chardev: mux: no chardev given");
+ return;
+ }
+ backend->mux = g_new0(ChardevMux, 1);
+ backend->mux->chardev = g_strdup(chardev);
+}
+
typedef struct CharDriver {
const char *name;
/* old, pre qapi */
@@ -3481,6 +3494,9 @@ QemuOptsList qemu_chardev_opts = {
},{
.name = "size",
.type = QEMU_OPT_SIZE,
+ },{
+ .name = "chardev",
+ .type = QEMU_OPT_STRING,
},
{ /* end of list */ }
},
@@ -3771,6 +3787,8 @@ static void register_types(void)
register_char_driver_qapi("console", CHARDEV_BACKEND_KIND_CONSOLE, NULL);
register_char_driver_qapi("pipe", CHARDEV_BACKEND_KIND_PIPE,
qemu_chr_parse_pipe);
+ register_char_driver_qapi("mux", CHARDEV_BACKEND_KIND_MUX,
+ qemu_chr_parse_mux);
}
type_init(register_types);
--
1.7.10.4
- [Qemu-devel] [PULL 02/14] qemu-socket: drop pointless allocation, (continued)
- [Qemu-devel] [PULL 02/14] qemu-socket: drop pointless allocation, Michael Tokarev, 2013/06/28
- [Qemu-devel] [PULL 03/14] qemu-socket: catch monitor_get_fd failures, Michael Tokarev, 2013/06/28
- [Qemu-devel] [PULL 04/14] qemu-char: check optional fields using has_*, Michael Tokarev, 2013/06/28
- [Qemu-devel] [PULL 05/14] qemu-char: use more specific error_setg_* variants, Michael Tokarev, 2013/06/28
- [Qemu-devel] [PULL 14/14] doc: we use seabios, not bochs bios, Michael Tokarev, 2013/06/28
- [Qemu-devel] [PULL 08/14] qemu-char: don't leak opts on error, Michael Tokarev, 2013/06/28
- [Qemu-devel] [PULL 07/14] qemu-char: fix documentation for telnet+wait socket flags, Michael Tokarev, 2013/06/28
- [Qemu-devel] [PULL 12/14] qemu-char: report udp backend errors, Michael Tokarev, 2013/06/28
- [Qemu-devel] [PULL 06/14] qemu-char: print notification to stderr, Michael Tokarev, 2013/06/28
- [Qemu-devel] [PULL 13/14] qemu-socket: don't leak opts on error, Michael Tokarev, 2013/06/28
- [Qemu-devel] [PULL 11/14] qemu-char: add -chardev mux support,
Michael Tokarev <=
- [Qemu-devel] [PULL 09/14] qemu-char: use ChardevBackendKind in CharDriver, Michael Tokarev, 2013/06/28
- [Qemu-devel] [PULL 10/14] qemu-char: minor mux chardev fixes, Michael Tokarev, 2013/06/28