From nobody Wed Feb 11 04:39:40 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1709999959858341.5926338948924; Sat, 9 Mar 2024 07:59:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1riz5G-0007Mr-FT; Sat, 09 Mar 2024 10:58:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1riz55-0007H0-TY; Sat, 09 Mar 2024 10:57:51 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1riz54-0004HT-6c; Sat, 09 Mar 2024 10:57:51 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id D52065452A; Sat, 9 Mar 2024 18:58:32 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 565A9944BF; Sat, 9 Mar 2024 18:57:36 +0300 (MSK) Received: (nullmailer pid 1694659 invoked by uid 1000); Sat, 09 Mar 2024 15:57:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Markus Armbruster , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 05/11] char: Slightly better error reporting when chardev is in use Date: Sat, 9 Mar 2024 18:57:23 +0300 Message-Id: <20240309155729.1694607-6-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240309155729.1694607-1-mjt@tls.msk.ru> References: <20240309155729.1694607-1-mjt@tls.msk.ru> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1709999960880100001 From: Markus Armbruster Both $ qemu-system-x86_64 -chardev null,id=3Dchr0,mux=3Don -mon chardev=3Dch= r0 -mon chardev=3Dchr0 -mon chardev=3Dchr0 -mon chardev=3Dchr0 -mon chardev= =3Dchr0 and $ qemu-system-x86_64 -chardev null,id=3Dchr0 -mon chardev=3Dchr0 -mon c= hardev=3Dchr0 fail with qemu-system-x86_64: -mon chardev=3Dchr0: Device 'chr0' is in use Improve to qemu-system-x86_64: -mon chardev=3Dchr0: too many uses of multiplexed c= hardev 'chr0' (maximum is 4) and qemu-system-x86_64: -mon chardev=3Dchr0: chardev 'chr0' is already in u= se Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- chardev/char-fe.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/chardev/char-fe.c b/chardev/char-fe.c index 20222a4cad..66cee8475a 100644 --- a/chardev/char-fe.c +++ b/chardev/char-fe.c @@ -199,13 +199,18 @@ bool qemu_chr_fe_init(CharBackend *b, Chardev *s, Err= or **errp) MuxChardev *d =3D MUX_CHARDEV(s); =20 if (d->mux_cnt >=3D MAX_MUX) { - goto unavailable; + error_setg(errp, + "too many uses of multiplexed chardev '%s'" + " (maximum is " stringify(MAX_MUX) ")", + s->label); + return false; } =20 d->backends[d->mux_cnt] =3D b; tag =3D d->mux_cnt++; } else if (s->be) { - goto unavailable; + error_setg(errp, "chardev '%s' is already in use", s->label); + return false; } else { s->be =3D b; } @@ -215,10 +220,6 @@ bool qemu_chr_fe_init(CharBackend *b, Chardev *s, Erro= r **errp) b->tag =3D tag; b->chr =3D s; return true; - -unavailable: - error_setg(errp, QERR_DEVICE_IN_USE, s->label); - return false; } =20 void qemu_chr_fe_deinit(CharBackend *b, bool del) --=20 2.39.2