From nobody Wed Nov 12 05:25:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1568392693; cv=none; d=zoho.com; s=zohoarc; b=k7RkiTfPuPFio+3bstm3Mfft13FHYaXO334u0NXn5WwmfIoHGZpNNrgH3IzeSdZoRIHKDBOayvRYMBr8Ok+GIfS9su98qCQavpgkYkoQsf534ELgS7EAcBJbzR37tnXtMpWUkU2NVP03ZHLhhThn454fhvpYIVq80BsJ7OYC6sE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568392693; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=NUfdhHymWVTEp0cV3dF3r/1ApmqJwnI+EqJ/Xy8iVbY=; b=TiOYZcEZ0LoyMEUK0v/kg6cFttmwX+Mvmdl+bYPlzFa8GMRdJwwzcSWzYq5k/0lW5lSWj1d37sySNbzB9h1xg5p7M2XcXjonr7IBS9Vw2JrT4jWP4rd+8o3u4JnL6XzDAjGgqUW47FkoGHJjpGTlZr4xeKqvPT+z8tJRu5mZgTY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1568392692973205.45278794115688; Fri, 13 Sep 2019 09:38:12 -0700 (PDT) Received: from localhost ([::1]:46152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8oaJ-0005Qs-RC for importer@patchew.org; Fri, 13 Sep 2019 12:38:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35664) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8oYq-0003qE-43 for qemu-devel@nongnu.org; Fri, 13 Sep 2019 12:36:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8oYo-0002gY-Jp for qemu-devel@nongnu.org; Fri, 13 Sep 2019 12:36:39 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:57988 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i8oYo-0002b6-FB for qemu-devel@nongnu.org; Fri, 13 Sep 2019 12:36:38 -0400 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x8DGWTKQ095104 for ; Fri, 13 Sep 2019 12:36:27 -0400 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0b-001b2d01.pphosted.com with ESMTP id 2v0cjewcnu-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 Sep 2019 12:36:27 -0400 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 13 Sep 2019 17:36:25 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 13 Sep 2019 17:36:24 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x8DGaNHc58589188 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Sep 2019 16:36:23 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8B572AE04D; Fri, 13 Sep 2019 16:36:23 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6B17CAE045; Fri, 13 Sep 2019 16:36:23 +0000 (GMT) Received: from bahia.lan (unknown [9.145.1.250]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 13 Sep 2019 16:36:23 +0000 (GMT) From: Greg Kurz To: Greg Kurz Date: Fri, 13 Sep 2019 18:36:23 +0200 User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19091316-0012-0000-0000-0000034AEBE3 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19091316-0013-0000-0000-000021855CA8 Message-Id: <156839258306.2228854.8411024885973295628.stgit@bahia.lan> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-09-13_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=850 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1909130167 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH] 9p: Print error hints if option parsing fails 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: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Option parsing fonctions are called with &error_fatal, which causes error_setg() to call exit() and the hints are never printed. Use an intermediate error object so that exit() happens in error_propagate() after error_append_hint() could be called. Signed-off-by: Greg Kurz --- hw/9pfs/9p-local.c | 11 +++++++---- hw/9pfs/9p-proxy.c | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c index 6f7309f4e691..2c80d2ac30f5 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c @@ -1486,8 +1486,9 @@ static int local_parse_opts(QemuOpts *opts, FsDriverE= ntry *fse, Error **errp) Error *local_err =3D NULL; =20 if (!sec_model) { - error_setg(errp, "security_model property not set"); - error_append_security_model_hint(errp); + error_setg(&local_err, "security_model property not set"); + error_append_security_model_hint(&local_err); + error_propagate(errp, local_err); return -1; } =20 @@ -1501,8 +1502,10 @@ static int local_parse_opts(QemuOpts *opts, FsDriver= Entry *fse, Error **errp) } else if (!strcmp(sec_model, "mapped-file")) { fse->export_flags |=3D V9FS_SM_MAPPED_FILE; } else { - error_setg(errp, "invalid security_model property '%s'", sec_model= ); - error_append_security_model_hint(errp); + error_setg(&local_err, "invalid security_model property '%s'", + sec_model); + error_append_security_model_hint(&local_err); + error_propagate(errp, local_err); return -1; } =20 diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c index 97ab9c58a573..5de5e53702f7 100644 --- a/hw/9pfs/9p-proxy.c +++ b/hw/9pfs/9p-proxy.c @@ -1126,15 +1126,18 @@ static int proxy_parse_opts(QemuOpts *opts, FsDrive= rEntry *fs, Error **errp) { const char *socket =3D qemu_opt_get(opts, "socket"); const char *sock_fd =3D qemu_opt_get(opts, "sock_fd"); + Error *local_err =3D NULL; =20 if (!socket && !sock_fd) { - error_setg(errp, "both socket and sock_fd properties are missing"); - error_append_socket_sockfd_hint(errp); + error_setg(&local_err, "both socket and sock_fd properties are mis= sing"); + error_append_socket_sockfd_hint(&local_err); + error_propagate(errp, local_err); return -1; } if (socket && sock_fd) { - error_setg(errp, "both socket and sock_fd properties are set"); - error_append_socket_sockfd_hint(errp); + error_setg(&local_err, "both socket and sock_fd properties are set= "); + error_append_socket_sockfd_hint(&local_err); + error_propagate(errp, local_err); return -1; } if (socket) {