From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42527) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Upyjf-0005WC-I9 for qemu-devel@nongnu.org; Fri, 21 Jun 2013 06:38:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Upyjd-0007jr-BG for qemu-devel@nongnu.org; Fri, 21 Jun 2013 06:38:31 -0400 From: Gerd Hoffmann Date: Fri, 21 Jun 2013 12:38:23 +0200 Message-Id: <1371811105-730-12-git-send-email-kraxel@redhat.com> In-Reply-To: <1371811105-730-1-git-send-email-kraxel@redhat.com> References: <1371811105-730-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 11/13] qemu-char: add -chardev mux support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Anthony Liguori , Gerd Hoffmann Allow to explicitly create mux chardevs on the command line, like you can using QMP. Signed-off-by: Gerd Hoffmann --- qemu-char.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/qemu-char.c b/qemu-char.c index 65c0c48..c83ff21 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3122,6 +3122,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 */ @@ -3488,6 +3501,9 @@ QemuOptsList qemu_chardev_opts = { },{ .name = "size", .type = QEMU_OPT_SIZE, + },{ + .name = "chardev", + .type = QEMU_OPT_STRING, }, { /* end of list */ } }, @@ -3778,6 +3794,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.9.7