From nobody Tue Feb 10 12:59:42 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=crudebyte.com ARC-Seal: i=1; a=rsa-sha256; t=1664919200; cv=none; d=zohomail.com; s=zohoarc; b=VB5qAE6q2HJedbrpIOLblGIvjNVC9VM3TYojRc/NcaFEg8zzgOKb+P/Qz9Q4VpKahL7SHwYmxX9oLQ8J8QQfIYzvwndxbtxrZwJC3TuZmSwnNT4LTSaoM36HsVZEyfRA9u2PEYMx3EsIC+pbMokLD7MOfPjjgpeQvspAWnr+Zco= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664919200; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=/MMjlmGcZsUSLLetGbdWwUYm5XcRnFhhIZO0YhKsmwU=; b=PjqPK/pzJzP47bRnbvIAd1wJdPLSHbgh3jPEsSI1my1+TMnlqhsdXo/Qw0XdFdb20LGCRxqVpXZy9ik9Ar5u7J9+ioKErWQy/Z9+GGOumWVad/GG1rcnjootk0+hCUhUNQhNCLRjWgvia9dC3rk7yyEk99RXC7061BlznEs7psE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664919200009202.4858408903209; Tue, 4 Oct 2022 14:33:20 -0700 (PDT) Received: from localhost ([::1]:46262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ofpXI-0005R3-Nk for importer@patchew.org; Tue, 04 Oct 2022 17:33:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <60c6a083f320b86f3172951445df7bbc895932e2@lizzy.crudebyte.com>) id 1ofpLW-0006Mo-Ez for qemu-devel@nongnu.org; Tue, 04 Oct 2022 17:20:58 -0400 Received: from lizzy.crudebyte.com ([91.194.90.13]:59903) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <60c6a083f320b86f3172951445df7bbc895932e2@lizzy.crudebyte.com>) id 1ofpLR-0002M6-47 for qemu-devel@nongnu.org; Tue, 04 Oct 2022 17:20:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=crudebyte.com; s=lizzy; h=Cc:To:Subject:Date:From:References:In-Reply-To: Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Content-ID: Content-Description; bh=/MMjlmGcZsUSLLetGbdWwUYm5XcRnFhhIZO0YhKsmwU=; b=lcxEA tVNYhWqNucO7WxnhUIRwE6N2R9qbXuSDCLnjFvihuqXZm2fma9Z6W994IDJQB9mn58SrYb8u4hk2W GKgDY3dC0ZrqECKEcQyGNPPj/w0XgXZCCcoAsYsK9f8MLsim3yitptU6kymDRRzcIi3v6t6lCzL3c 7b1OfPrjfwj4rtwqTVb3PIwvi82TNT8ElBFZF+M2ejPBYwZWuXkrp1GbxEbsiZ1R2TSR9ZC1obbW0 gIRMZhYm5LK+H8tWtP6Re1fKX1dIQZIjLIZ8JFSRLCm0H8mI4r98kAOQywsTbhRZU6JaTJBtCR2VP aFArqDGhSkgOkQBMrSRZFFQ3bOVug==; Message-Id: <60c6a083f320b86f3172951445df7bbc895932e2.1664917004.git.qemu_oss@crudebyte.com> In-Reply-To: References: From: Christian Schoenebeck Date: Tue, 4 Oct 2022 22:53:44 +0200 Subject: [PATCH 07/20] tests/9p: simplify callers of tgetattr() To: qemu-devel@nongnu.org Cc: Greg Kurz 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: none client-ip=91.194.90.13; envelope-from=60c6a083f320b86f3172951445df7bbc895932e2@lizzy.crudebyte.com; helo=lizzy.crudebyte.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_NONE=0.001 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" X-ZohoMail-DKIM: pass (identity @crudebyte.com) X-ZM-MESSAGEID: 1664919202105100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Now as tgetattr() is using a declarative approach, simplify the code of callers of this function. Signed-off-by: Christian Schoenebeck --- tests/qtest/virtio-9p-test.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c index 9c1219db33..ae1220d0cb 100644 --- a/tests/qtest/virtio-9p-test.c +++ b/tests/qtest/virtio-9p-test.c @@ -264,8 +264,7 @@ static void fs_walk_2nd_nonexistent(void *obj, void *da= ta, v9fs_set_allocator(t_alloc); v9fs_qid root_qid; uint16_t nwqid; - uint32_t fid, err; - P9Req *req; + uint32_t fid; g_autofree v9fs_qid *wqid =3D NULL; g_autofree char *path =3D g_strdup_printf( QTEST_V9FS_SYNTH_WALK_FILE "/non-existent", 0 @@ -286,14 +285,10 @@ static void fs_walk_2nd_nonexistent(void *obj, void *= data, g_assert(wqid && wqid[0] && !is_same_qid(root_qid, wqid[0])); =20 /* expect fid being unaffected by walk above */ - req =3D tgetattr({ + tgetattr({ .client =3D v9p, .fid =3D fid, .request_mask =3D P9_GETATTR_BASIC, - .requestOnly =3D true - }).req; - v9fs_req_wait_for_reply(req, NULL); - v9fs_rlerror(req, &err); - - g_assert_cmpint(err, =3D=3D, ENOENT); + .expectErr =3D ENOENT + }); } =20 static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) @@ -302,7 +297,6 @@ static void fs_walk_none(void *obj, void *data, QGuestA= llocator *t_alloc) v9fs_set_allocator(t_alloc); v9fs_qid root_qid; g_autofree v9fs_qid *wqid =3D NULL; - P9Req *req; struct v9fs_attr attr; =20 tversion({ .client =3D v9p }); @@ -319,12 +313,10 @@ static void fs_walk_none(void *obj, void *data, QGues= tAllocator *t_alloc) /* special case: no QID is returned if nwname=3D0 was sent */ g_assert(wqid =3D=3D NULL); =20 - req =3D tgetattr({ + tgetattr({ .client =3D v9p, .fid =3D 1, .request_mask =3D P9_GETATTR_BASIC, - .requestOnly =3D true - }).req; - v9fs_req_wait_for_reply(req, NULL); - v9fs_rgetattr(req, &attr); + .rgetattr.attr =3D &attr + }); =20 g_assert(is_same_qid(root_qid, attr.qid)); } --=20 2.30.2