From nobody Sun May 5 17:01:13 2024 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; 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1509998872123689.1039976445888; Mon, 6 Nov 2017 12:07:52 -0800 (PST) Received: from localhost ([::1]:50086 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eBngD-0007Tb-6J for importer@patchew.org; Mon, 06 Nov 2017 15:07:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eBnf3-0006TA-In for qemu-devel@nongnu.org; Mon, 06 Nov 2017 15:06:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eBnez-0001tG-HR for qemu-devel@nongnu.org; Mon, 06 Nov 2017 15:06:21 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:51298) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eBnez-0001sy-8K for qemu-devel@nongnu.org; Mon, 06 Nov 2017 15:06:17 -0500 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id vA6K5W2V002243 for ; Mon, 6 Nov 2017 15:06:12 -0500 Received: from e06smtp11.uk.ibm.com (e06smtp11.uk.ibm.com [195.75.94.107]) by mx0a-001b2d01.pphosted.com with ESMTP id 2e2ue9280m-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 06 Nov 2017 15:06:11 -0500 Received: from localhost by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 6 Nov 2017 20:06:09 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 6 Nov 2017 20:06:07 -0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id vA6K67Cm40435878; Mon, 6 Nov 2017 20:06:07 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CED2511C066; Mon, 6 Nov 2017 20:01:06 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BCA2411C052; Mon, 6 Nov 2017 20:01:06 +0000 (GMT) Received: from smtp.lab.toulouse-stg.fr.ibm.com (unknown [9.101.4.1]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 6 Nov 2017 20:01:06 +0000 (GMT) Received: from bahia.lan (icon-9-164-145-19.megacenter.de.ibm.com [9.164.145.19]) by smtp.lab.toulouse-stg.fr.ibm.com (Postfix) with ESMTP id 394D222035A; Mon, 6 Nov 2017 21:06:06 +0100 (CET) From: Greg Kurz To: qemu-devel@nongnu.org Date: Mon, 6 Nov 2017 21:05:53 +0100 X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171106200554.5894-1-groug@kaod.org> References: <20171106200554.5894-1-groug@kaod.org> X-TM-AS-GCONF: 00 x-cbid: 17110620-0040-0000-0000-0000040B31C9 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17110620-0041-0000-0000-000020ADC9F1 Message-Id: <20171106200554.5894-2-groug@kaod.org> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-11-06_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=13 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1711060273 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PULL 1/2] 9pfs: drop one user of struct V9fsFidState 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: Peter Maydell , Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" To comply with QEMU coding style. Signed-off-by: Greg Kurz --- hw/9pfs/9p.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h index d1cfeaf10e4f..cdfc4f4ce787 100644 --- a/hw/9pfs/9p.h +++ b/hw/9pfs/9p.h @@ -117,7 +117,7 @@ static inline char *rpath(FsContext *ctx, const char *p= ath) #define P9_IOHDRSZ 24 =20 typedef struct V9fsPDU V9fsPDU; -struct V9fsState; +typedef struct V9fsState V9fsState; =20 typedef struct { uint32_t size_le; @@ -137,7 +137,7 @@ struct V9fsPDU uint8_t id; uint8_t cancelled; CoQueue complete; - struct V9fsState *s; + V9fsState *s; QLIST_ENTRY(V9fsPDU) next; uint32_t idx; }; @@ -230,7 +230,7 @@ struct V9fsFidState V9fsFidState *rclm_lst; }; =20 -typedef struct V9fsState +struct V9fsState { QLIST_HEAD(, V9fsPDU) free_list; QLIST_HEAD(, V9fsPDU) active_list; @@ -251,7 +251,7 @@ typedef struct V9fsState Error *migration_blocker; V9fsConf fsconf; V9fsQID root_qid; -} V9fsState; +}; =20 /* 9p2000.L open flags */ #define P9_DOTL_RDONLY 00000000 --=20 2.13.6 From nobody Sun May 5 17:01:13 2024 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; 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 1509998877848173.61923060028698; Mon, 6 Nov 2017 12:07:57 -0800 (PST) Received: from localhost ([::1]:50087 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eBngQ-0007ah-Rg for importer@patchew.org; Mon, 06 Nov 2017 15:07:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eBnf9-0006cN-OS for qemu-devel@nongnu.org; Mon, 06 Nov 2017 15:06:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eBnf5-0001vb-P7 for qemu-devel@nongnu.org; Mon, 06 Nov 2017 15:06:27 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:46500) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eBnf5-0001vK-Fu for qemu-devel@nongnu.org; Mon, 06 Nov 2017 15:06:23 -0500 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id vA6K5P23091731 for ; Mon, 6 Nov 2017 15:06:15 -0500 Received: from e06smtp13.uk.ibm.com (e06smtp13.uk.ibm.com [195.75.94.109]) by mx0a-001b2d01.pphosted.com with ESMTP id 2e2wmjjm52-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 06 Nov 2017 15:06:14 -0500 Received: from localhost by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 6 Nov 2017 20:06:11 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 6 Nov 2017 20:06:09 -0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id vA6K69Er39125066; Mon, 6 Nov 2017 20:06:09 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A99DF52043; Mon, 6 Nov 2017 19:00:02 +0000 (GMT) Received: from smtp.lab.toulouse-stg.fr.ibm.com (unknown [9.101.4.1]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 9826052041; Mon, 6 Nov 2017 19:00:02 +0000 (GMT) Received: from bahia.lan (icon-9-164-145-19.megacenter.de.ibm.com [9.164.145.19]) by smtp.lab.toulouse-stg.fr.ibm.com (Postfix) with ESMTP id C3FDD22035A; Mon, 6 Nov 2017 21:06:08 +0100 (CET) From: Greg Kurz To: qemu-devel@nongnu.org Date: Mon, 6 Nov 2017 21:05:54 +0100 X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171106200554.5894-1-groug@kaod.org> References: <20171106200554.5894-1-groug@kaod.org> X-TM-AS-GCONF: 00 x-cbid: 17110620-0012-0000-0000-0000058A3035 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17110620-0013-0000-0000-00001904CF84 Message-Id: <20171106200554.5894-3-groug@kaod.org> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-11-06_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=4 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1711060273 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PULL 2/2] 9pfs: fix v9fs_mark_fids_unreclaim() return value 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: Peter Maydell , Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The return value of v9fs_mark_fids_unreclaim() is then propagated to pdu_complete(). It should be a negative errno, not -1. Signed-off-by: Greg Kurz Reviewed-by: Eric Blake --- hw/9pfs/9p.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index f8bbac251dc9..52d46632fe15 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -512,7 +512,7 @@ static int coroutine_fn v9fs_mark_fids_unreclaim(V9fsPD= U *pdu, V9fsPath *path) /* reopen the file/dir if already closed */ err =3D v9fs_reopen_fid(pdu, fidp); if (err < 0) { - return -1; + return err; } /* * Go back to head of fid list because --=20 2.13.6