From patchwork Thu Feb 28 07:49:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 223800 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 813ED2C0084 for ; Thu, 28 Feb 2013 18:56:41 +1100 (EST) Received: from localhost ([::1]:36806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAyM3-0000as-HC for incoming@patchwork.ozlabs.org; Thu, 28 Feb 2013 02:56:39 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45533) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAyG5-00080X-2o for qemu-devel@nongnu.org; Thu, 28 Feb 2013 02:50:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UAyG3-000788-CY for qemu-devel@nongnu.org; Thu, 28 Feb 2013 02:50:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6238) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAyG2-00077k-OQ for qemu-devel@nongnu.org; Thu, 28 Feb 2013 02:50:27 -0500 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 r1S7oMmV018769 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 28 Feb 2013 02:50:26 -0500 Received: from rincewind.home.kraxel.org (ovpn-116-29.ams2.redhat.com [10.36.116.29]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r1S7oApl018485; Thu, 28 Feb 2013 02:50:13 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 1BB43452AF; Thu, 28 Feb 2013 08:50:10 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2013 08:49:54 +0100 Message-Id: <1362037809-27836-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1362037809-27836-1-git-send-email-kraxel@redhat.com> References: <1362037809-27836-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/17] 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 cf6b98b..fc908fa 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3049,6 +3049,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 = backend_table[i].kind; @@ -3058,10 +3063,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: @@ -3411,7 +3430,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) { @@ -3449,6 +3468,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; @@ -3459,7 +3487,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 {