From nobody Mon Feb 9 18:44:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1501604651420638.9359049819168; Tue, 1 Aug 2017 09:24:11 -0700 (PDT) Received: from localhost ([::1]:43610 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dcZxp-0001Ud-NI for importer@patchew.org; Tue, 01 Aug 2017 12:24:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dcZrW-0004Jc-2B for qemu-devel@nongnu.org; Tue, 01 Aug 2017 12:17:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dcZrV-0007Bt-2U for qemu-devel@nongnu.org; Tue, 01 Aug 2017 12:17:38 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:36419) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dcZrU-0007Av-SE for qemu-devel@nongnu.org; Tue, 01 Aug 2017 12:17:36 -0400 Received: by mail-wm0-x242.google.com with SMTP id d40so3781765wma.3 for ; Tue, 01 Aug 2017 09:17:36 -0700 (PDT) Received: from 640k.lan (94-39-192-75.adsl-ull.clienti.tiscali.it. [94.39.192.75]) by smtp.gmail.com with ESMTPSA id u187sm1724160wmd.26.2017.08.01.09.17.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2017 09:17:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=mKOXHS+KiRiYMc85jXGlAXR4i3BnOffGifp8rX/796A=; b=hg1udR+8CKpmUha4WYlNqMXw/hNAwVfoiaDB49YI14cU+0sN94btJWqf3qm2kJ9zrO afr+FrBH+XfCdQ3Crx1odYhbE6YvVHIt44k8clfp0ZEX+63kwdKEDXN83GuMN/KBBnrf 6QTajtU21+Fq59oKWD1lsaQcHjMoz6SCNR8MPAKhn2K9cjlPZ3XSn5d3pXZKfn2IbpLD CbkFOVue8gsHzMB5+bVWfb4mQF/2KpK6Wk29loXUw2S0JSJ4vh+/K4AgEeImVNDS6KJt ZBSJV4Xc/X2hxZTTc/ZPfx8XhIZcjysDtCOYWC1pJIB22DY4rCHzV0j57s+vDe2QwAkY 5IOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=mKOXHS+KiRiYMc85jXGlAXR4i3BnOffGifp8rX/796A=; b=DUwqXgP3UVWesPpYfygZSLGJr6coBYPHwP8tLrMP4IWoNO8ZiDMlRjB/GnlVSPPtI5 rhTg1WMunNqMkfBZVtUxX6/ZtYtDikAjq/DeREUTyYoHkd2R8WgD7pEMMBbpIb4BnOhC k9RhuZV66iOPdurUlPzePA9wNV5BXYzW6AAOODnlDyYcfkniLBxzilve7ClIGEx+ZSqk 0uzYzEtorifAVI4CMgeJTtHVpjdWiYcDZtOBtie2ERlVTpD2Pq09i3/F4X7DGOCAEoqM m7yRMGcxrO98nWEvLG2BJJcCl6WGceY+1ji9l1IoC4X3Ysci/W+f1KM0URG0OgxVdUmo j8zQ== X-Gm-Message-State: AIVw113nEQmLWcdw0UAxhOe9T7Afmw2LRhAESA0KzDoP7JM6DuonEYsp e6HfjHNUWis+HGDt75Y= X-Received: by 10.28.27.23 with SMTP id b23mr1734964wmb.108.1501604255579; Tue, 01 Aug 2017 09:17:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 1 Aug 2017 18:17:13 +0200 Message-Id: <1501604245-33460-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1501604245-33460-1-git-send-email-pbonzini@redhat.com> References: <1501604245-33460-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 05/17] char: don't exit on hmp 'chardev-add help' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anton Nefedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Anton Nefedov qemu_chr_new_from_opts() is used from both vl.c and hmp, and it is quite confusing to see qemu suddenly exit after receiving a help option in hmp. Do exit(0) from vl.c instead. Signed-off-by: Anton Nefedov Message-Id: <1500977081-120929-1-git-send-email-anton.nefedov@virtuozzo.com> Signed-off-by: Paolo Bonzini --- chardev/char.c | 2 +- include/chardev/char.h | 4 +++- vl.c | 10 ++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/chardev/char.c b/chardev/char.c index c34b44a..5d283b9 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -620,7 +620,7 @@ Chardev *qemu_chr_new_from_opts(QemuOpts *opts, Error *= *errp) =20 error_report("Available chardev backend types: %s", str->str); g_string_free(str, true); - exit(0); + return NULL; } =20 if (id =3D=3D NULL) { diff --git a/include/chardev/char.h b/include/chardev/char.h index 1604ea9..66dde46 100644 --- a/include/chardev/char.h +++ b/include/chardev/char.h @@ -65,7 +65,9 @@ struct Chardev { * * @opts see qemu-config.c for a list of valid options * - * Returns: a new character backend + * Returns: on success: a new character backend + * otherwise: NULL; @errp specifies the error + * or left untouched in case of help option */ Chardev *qemu_chr_new_from_opts(QemuOpts *opts, Error **errp); diff --git a/vl.c b/vl.c index dd803fc..99fcfa0 100644 --- a/vl.c +++ b/vl.c @@ -2344,10 +2344,12 @@ static int chardev_init_func(void *opaque, QemuOpts= *opts, Error **errp) { Error *local_err =3D NULL; =20 - qemu_chr_new_from_opts(opts, &local_err); - if (local_err) { - error_report_err(local_err); - return -1; + if (!qemu_chr_new_from_opts(opts, &local_err)) { + if (local_err) { + error_report_err(local_err); + return -1; + } + exit(0); } return 0; } --=20 1.8.3.1