From nobody Thu Oct 2 14:22:17 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605204449; cv=none; d=zohomail.com; s=zohoarc; b=cRBTFPvBMhsQZ1dATYkRtLBeBWlVEN/nImG9Gjl5MHhihwH3TaH6IGFCdzhbV9plKZd9hVRfg6WGiVPwRG9hhaTccY+Pj8/bGt4S7ccToknDx06gLU5Qm088fFN1Nw4GVHnSSqmOLUSKqdhVcj97y/nzi8x2iHBXNuo96xHmYuM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605204449; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NmA3MmZqTxiwtBEfqDIKt2m4ARbVg0BIQ6mvwBFM2S4=; b=Y5kYnb3pqc61sENg49Nv35dzcTeD8FzrnxoFF9/FFM6xSpmLp6p8LbA72ap3ZKrZAyO5UNF4bKlhVQvG5SRTSnjqMhzrEbiHuFtCrBWKeTtS6U4EdbyLEMFH93N8iOkKBmGwTDq+2EgGR6xG/GmDJDTt1zQnXPUjHrBlsNuU9LQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605204449599412.7501203468821; Thu, 12 Nov 2020 10:07:29 -0800 (PST) Received: from localhost ([::1]:39448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdH0K-0001Wq-Dk for importer@patchew.org; Thu, 12 Nov 2020 13:07:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdGt3-0001BM-Ke for qemu-devel@nongnu.org; Thu, 12 Nov 2020 12:59:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:33160) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdGsp-0000m9-Qg for qemu-devel@nongnu.org; Thu, 12 Nov 2020 12:59:51 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-247-R1AmfjQXNpC5rU9H6cSqRg-1; Thu, 12 Nov 2020 12:59:35 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3C4D3801817 for ; Thu, 12 Nov 2020 17:59:34 +0000 (UTC) Received: from merkur.fritz.box (ovpn-115-57.ams2.redhat.com [10.36.115.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94DAB1002C13; Thu, 12 Nov 2020 17:59:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605203980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NmA3MmZqTxiwtBEfqDIKt2m4ARbVg0BIQ6mvwBFM2S4=; b=XuSlxmgILIxEV53n9uTLn5/Tv/3hNq31mnDnRG3BQfr/esfrhSqsgH78neOAPozurmpIZO cUSmIxOlBePBp75OjpkFUrZyH9nQDW05IGw8ogKQLl0KQn9H0JSWytLggzCyuYSysqWF5T nlmcYzmxkKJPctglPbFjfHHI/g3sw2Y= X-MC-Unique: R1AmfjQXNpC5rU9H6cSqRg-1 From: Kevin Wolf To: qemu-devel@nongnu.org Subject: [PATCH 08/13] char: Add mux option to ChardevOptions Date: Thu, 12 Nov 2020 18:59:00 +0100 Message-Id: <20201112175905.404472-9-kwolf@redhat.com> In-Reply-To: <20201112175905.404472-1-kwolf@redhat.com> References: <20201112175905.404472-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 08:00:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, armbru@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com, marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The final missing piece to achieve compatibility between qemu_chr_parse_cli_str()/qemu_chr_new_cli() and the legacy command line is support for the 'mux' option. Implement it. Signed-off-by: Kevin Wolf --- qapi/char.json | 4 +++- chardev/char.c | 41 +++++++++++++++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/qapi/char.json b/qapi/char.json index e1f9347044..d6733a5473 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -453,12 +453,14 @@ # # @id: the chardev's ID, must be unique # @backend: backend type and parameters +# @mux: enable multiplexing mode (default: false) # # Since: 6.0 ## { 'struct': 'ChardevOptions', 'data': { 'id': 'str', - 'backend': 'ChardevBackend' }, + 'backend': 'ChardevBackend', + '*mux': 'bool' }, 'aliases': [ { 'source': ['backend'] } ] } =20 ## diff --git a/chardev/char.c b/chardev/char.c index a5d6be9dc8..3bb6a743f7 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -742,11 +742,6 @@ void qemu_chr_translate_legacy_options(QDict *args) =20 /* name may refer to a QDict entry, so delete it only now */ qdict_del(args, "backend"); - - /* - * TODO: - * All backend types: "mux" - */ } =20 Chardev *qemu_chr_new_noreplay(const char *label, const char *filename, @@ -1105,7 +1100,41 @@ ChardevReturn *qmp_chardev_add(const char *id, Chard= evBackend *backend, =20 Chardev *qemu_chr_new_cli(ChardevOptions *options, Error **errp) { - return chardev_new_qapi(options->id, options->backend, errp); + Chardev *chr; + char *bid =3D NULL; + + if (options->mux) { + bid =3D g_strdup_printf("%s-base", options->id); + } + + chr =3D chardev_new_qapi(bid ?: options->id, options->backend, errp); + if (!chr) { + goto out; + } + + if (options->mux) { + Chardev *mux; + ChardevMux mux_data =3D { + .chardev =3D bid, + }; + ChardevBackend backend =3D { + .type =3D CHARDEV_BACKEND_KIND_MUX, + .u.mux.data =3D &mux_data, + }; + + mux =3D qemu_chardev_new(options->id, TYPE_CHARDEV_MUX, &backend, = NULL, + errp); + if (mux =3D=3D NULL) { + object_unparent(OBJECT(chr)); + chr =3D NULL; + goto out; + } + chr =3D mux; + } + +out: + g_free(bid); + return chr; } =20 ChardevOptions *qemu_chr_parse_cli_dict(QDict *args, bool help, --=20 2.28.0