From patchwork Tue Mar 12 08:56:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 226840 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 506762C0296 for ; Tue, 12 Mar 2013 19:58:50 +1100 (EST) Received: from localhost ([::1]:48915 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFL2m-0000fW-Ha for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2013 04:58:48 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFL0g-0005q3-P4 for qemu-devel@nongnu.org; Tue, 12 Mar 2013 04:56:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFL0a-0003y5-NF for qemu-devel@nongnu.org; Tue, 12 Mar 2013 04:56:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46270) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFL0a-0003xB-Dg for qemu-devel@nongnu.org; Tue, 12 Mar 2013 04:56:32 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2C8uVdE014896 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 12 Mar 2013 04:56:31 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-28.ams2.redhat.com [10.36.116.28]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2C8uUmg002336; Tue, 12 Mar 2013 04:56:30 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 8F0204150C; Tue, 12 Mar 2013 09:56:29 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2013 09:56:12 +0100 Message-Id: <1363078589-15233-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1363078589-15233-1-git-send-email-kraxel@redhat.com> References: <1363078589-15233-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 02/19] chardev: add mux chardev support to qapi X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This adds mux chardev support to the qapi and also makes the qapi-based chardev creation path handle the "mux=on" option correctly. --- qapi-schema.json | 14 +++++++++++++- qemu-char.c | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 28b070f..d8cc85c 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3185,6 +3185,17 @@ '*telnet' : 'bool' } } ## +# @ChardevMux: +# +# Configuration info for mux chardevs. +# +# @chardev: name of the base chardev. +# +# Since: 1.5 +## +{ 'type': 'ChardevMux', 'data': { 'chardev' : 'str' } } + +## # @ChardevBackend: # # Configuration info for the new chardev backend. @@ -3198,7 +3209,8 @@ 'parallel': 'ChardevHostdev', 'socket' : 'ChardevSocket', 'pty' : 'ChardevDummy', - 'null' : 'ChardevDummy' } } + 'null' : 'ChardevDummy', + 'mux' : 'ChardevMux' } } ## # @ChardevReturn: diff --git a/qemu-char.c b/qemu-char.c index 1d92ff1..38890ed 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3249,6 +3249,11 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, ChardevBackend *backend = g_new0(ChardevBackend, 1); ChardevReturn *ret = NULL; const char *id = qemu_opts_id(opts); + const char *bid = NULL; + + if (qemu_opt_get_bool(opts, "mux", 0)) { + bid = g_strdup_printf("%s-base", id); + } chr = NULL; backend->kind = cd->kind; @@ -3258,10 +3263,24 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, goto qapi_out; } } - ret = qmp_chardev_add(qemu_opts_id(opts), backend, errp); + ret = qmp_chardev_add(bid ? bid : id, backend, errp); if (error_is_set(errp)) { goto qapi_out; } + + if (bid) { + qapi_free_ChardevBackend(backend); + qapi_free_ChardevReturn(ret); + backend = g_new0(ChardevBackend, 1); + backend->mux = g_new0(ChardevMux, 1); + backend->kind = CHARDEV_BACKEND_KIND_MUX; + backend->mux->chardev = g_strdup(bid); + ret = qmp_chardev_add(id, backend, errp); + if (error_is_set(errp)) { + goto qapi_out; + } + } + chr = qemu_chr_find(id); qapi_out: @@ -3629,7 +3648,7 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, Error **errp) { ChardevReturn *ret = g_new0(ChardevReturn, 1); - CharDriverState *chr = NULL; + CharDriverState *base, *chr = NULL; chr = qemu_chr_find(id); if (chr) { @@ -3667,6 +3686,15 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, case CHARDEV_BACKEND_KIND_NULL: chr = qemu_chr_open_null(NULL); break; + case CHARDEV_BACKEND_KIND_MUX: + base = qemu_chr_find(backend->mux->chardev); + if (base == NULL) { + error_setg(errp, "mux: base chardev %s not found", + backend->mux->chardev); + break; + } + chr = qemu_chr_open_mux(base); + break; default: error_setg(errp, "unknown chardev backend (%d)", backend->kind); break; @@ -3677,7 +3705,8 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, } if (chr) { chr->label = g_strdup(id); - chr->avail_connections = 1; + chr->avail_connections = + (backend->kind == CHARDEV_BACKEND_KIND_MUX) ? MAX_MUX : 1; QTAILQ_INSERT_TAIL(&chardevs, chr, next); return ret; } else {