From nobody Mon Nov 17 09:50:44 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1603453893; cv=none; d=zohomail.com; s=zohoarc; b=bkoRPvm6Fed9VojtSrErF6n9CHaYzpVGp3fwP63N1MfeSzqjNUD/iisM1TVZ3XaYdIe9sJFLk0qSWUGbbXxSbfdk7lrLMHoNWcwJH56wMXV3tXRKESDDcrzt8/1I4k+ZkVp9kqbyvlhQmxOGlCt82aTKUAMxV/DQtv1BXVVD42k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603453893; 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=UsOVei79IdluMiZAcSbtm6/KQem/MiCxwvsRkXgSpbg=; b=lLPybMd0JlWzbCQqfOwildi+NlX/jRdQxQOrKNmeH0uP4xFZYLBtH3NeT5OmxNfwBQW/W8PVID+1RJNM/2n7CafzNwAwGn1n6b7OqCkx7TU/Yip4nGJhKmctjQzqouGlqENWOIdaIRogmBHQadsNA6IJXOASedJuvcr0K7CJ4Zk= ARC-Authentication-Results: i=1; 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 1603453893810426.4057648120362; Fri, 23 Oct 2020 04:51:33 -0700 (PDT) Received: from localhost ([::1]:53366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVvbY-0000Jd-OM for importer@patchew.org; Fri, 23 Oct 2020 07:51:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVvY3-0003uF-4z for qemu-devel@nongnu.org; Fri, 23 Oct 2020 07:47:56 -0400 Received: from lizzy.crudebyte.com ([91.194.90.13]:41855) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVvY1-0004IE-KD for qemu-devel@nongnu.org; Fri, 23 Oct 2020 07:47:54 -0400 Message-Id: In-Reply-To: References: From: Greg Kurz Date: Tue, 20 Oct 2020 18:09:34 +0200 Subject: [PULL 03/13] tests/9pfs: Factor out do_attach() helper To: qemu-devel@nongnu.org, Peter Maydell 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=c06e9118de9642966a2dc368077087ce1571f63e@lizzy.crudebyte.com; helo=lizzy.crudebyte.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/23 07:46:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -15 X-Spam_score: -1.6 X-Spam_bar: - X-Spam_report: (-1.6 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" fs_attach() is a top level test function. Factor out the reusable code to a separate helper instead of hijacking it in other tests. Signed-off-by: Greg Kurz Message-Id: <160321017450.266767.17377192504263871186.stgit@bahia.lan> Signed-off-by: Christian Schoenebeck --- tests/qtest/virtio-9p-test.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c index 93a2a4cd76..e07292bdb8 100644 --- a/tests/qtest/virtio-9p-test.c +++ b/tests/qtest/virtio-9p-test.c @@ -589,10 +589,8 @@ static void fs_version(void *obj, void *data, QGuestAl= locator *t_alloc) do_version(obj); } =20 -static void fs_attach(void *obj, void *data, QGuestAllocator *t_alloc) +static void do_attach(QVirtio9P *v9p) { - QVirtio9P *v9p =3D obj; - alloc =3D t_alloc; P9Req *req; =20 do_version(v9p); @@ -601,6 +599,12 @@ static void fs_attach(void *obj, void *data, QGuestAll= ocator *t_alloc) v9fs_rattach(req, NULL); } =20 +static void fs_attach(void *obj, void *data, QGuestAllocator *t_alloc) +{ + alloc =3D t_alloc; + do_attach(obj); +} + static void fs_walk(void *obj, void *data, QGuestAllocator *t_alloc) { QVirtio9P *v9p =3D obj; @@ -615,7 +619,7 @@ static void fs_walk(void *obj, void *data, QGuestAlloca= tor *t_alloc) wnames[i] =3D g_strdup_printf(QTEST_V9FS_SYNTH_WALK_FILE, i); } =20 - fs_attach(v9p, NULL, t_alloc); + do_attach(v9p); req =3D v9fs_twalk(v9p, 0, 1, P9_MAXWELEM, wnames, 0); v9fs_req_wait_for_reply(req, NULL); v9fs_rwalk(req, &nwqid, &wqid); @@ -684,7 +688,7 @@ static void fs_readdir(void *obj, void *data, QGuestAll= ocator *t_alloc) struct V9fsDirent *entries =3D NULL; P9Req *req; =20 - fs_attach(v9p, NULL, t_alloc); + do_attach(v9p); req =3D v9fs_twalk(v9p, 0, 1, 1, wnames, 0); v9fs_req_wait_for_reply(req, NULL); v9fs_rwalk(req, &nqid, NULL); @@ -741,7 +745,7 @@ static void fs_readdir_split(void *obj, void *data, QGu= estAllocator *t_alloc, int fid; uint64_t offset; =20 - fs_attach(v9p, NULL, t_alloc); + do_attach(v9p); =20 fid =3D 1; offset =3D 0; @@ -817,7 +821,7 @@ static void fs_walk_no_slash(void *obj, void *data, QGu= estAllocator *t_alloc) P9Req *req; uint32_t err; =20 - fs_attach(v9p, NULL, t_alloc); + do_attach(v9p); req =3D v9fs_twalk(v9p, 0, 1, 1, wnames, 0); v9fs_req_wait_for_reply(req, NULL); v9fs_rlerror(req, &err); @@ -857,7 +861,7 @@ static void fs_lopen(void *obj, void *data, QGuestAlloc= ator *t_alloc) char *const wnames[] =3D { g_strdup(QTEST_V9FS_SYNTH_LOPEN_FILE) }; P9Req *req; =20 - fs_attach(v9p, NULL, t_alloc); + do_attach(v9p); req =3D v9fs_twalk(v9p, 0, 1, 1, wnames, 0); v9fs_req_wait_for_reply(req, NULL); v9fs_rwalk(req, NULL, NULL); @@ -879,7 +883,7 @@ static void fs_write(void *obj, void *data, QGuestAlloc= ator *t_alloc) uint32_t count; P9Req *req; =20 - fs_attach(v9p, NULL, t_alloc); + do_attach(v9p); req =3D v9fs_twalk(v9p, 0, 1, 1, wnames, 0); v9fs_req_wait_for_reply(req, NULL); v9fs_rwalk(req, NULL, NULL); @@ -906,7 +910,7 @@ static void fs_flush_success(void *obj, void *data, QGu= estAllocator *t_alloc) uint32_t reply_len; uint8_t should_block; =20 - fs_attach(v9p, NULL, t_alloc); + do_attach(v9p); req =3D v9fs_twalk(v9p, 0, 1, 1, wnames, 0); v9fs_req_wait_for_reply(req, NULL); v9fs_rwalk(req, NULL, NULL); @@ -943,7 +947,7 @@ static void fs_flush_ignored(void *obj, void *data, QGu= estAllocator *t_alloc) uint32_t count; uint8_t should_block; =20 - fs_attach(v9p, NULL, t_alloc); + do_attach(v9p); req =3D v9fs_twalk(v9p, 0, 1, 1, wnames, 0); v9fs_req_wait_for_reply(req, NULL); v9fs_rwalk(req, NULL, NULL); @@ -1026,7 +1030,7 @@ static void fs_create_dir(void *obj, void *data, QGue= stAllocator *t_alloc) =20 g_assert(root_path !=3D NULL); =20 - fs_attach(v9p, NULL, t_alloc); + do_attach(v9p); fs_mkdir(v9p, data, t_alloc, "/", "01"); =20 /* check if created directory really exists now ... */ --=20 2.20.1