From nobody Mon Feb 9 17:07:18 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=1664920308; cv=none; d=zohomail.com; s=zohoarc; b=IzvqVO0NLL8g2eZtce3zHEpvnM1Rva7bXp5PCP/NB7kX9sbnQKPCfNYKG2/FxHApgUI5MRXxzw2dnNvPrdSYn9kvvVX2NPfJGpgM66vRYTCTXfvQCiovSvr0Jt2mYGcoHZAez5VqIThpSiqKlpGYYnhFYi1jXmYV3QaZ8ClrDqE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664920308; 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=WhbbawzGxg06KAOTAn2Dp9eQQ655jR2otNYjhZi9xMM=; b=agJjXKzdoFJvEpCW+A9W23mMRWCq+x3E21W9Z58zDg8rlYFEUZMyQJMqmKW9/VHTyIoVCmU4io8NFbT6teG+6BQh3Vwm9XlAvmaARFhtgsyZN9UweVO/YERvRch7ZA5+1F5ZeEHxSlB3sofa/vR+7HD8c+r9BjRvvYlnogejjaQ= 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 1664920308878677.9164700865388; Tue, 4 Oct 2022 14:51:48 -0700 (PDT) Received: from localhost ([::1]:34486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ofppL-0000pT-TC for importer@patchew.org; Tue, 04 Oct 2022 17:51:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <4c01b2caa5f5b54a2020fc92701deadd2abf0571@lizzy.crudebyte.com>) id 1ofpMX-0007EZ-Um for qemu-devel@nongnu.org; Tue, 04 Oct 2022 17:22:03 -0400 Received: from lizzy.crudebyte.com ([91.194.90.13]:33993) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <4c01b2caa5f5b54a2020fc92701deadd2abf0571@lizzy.crudebyte.com>) id 1ofpMS-0002ip-VJ for qemu-devel@nongnu.org; Tue, 04 Oct 2022 17:22:00 -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=WhbbawzGxg06KAOTAn2Dp9eQQ655jR2otNYjhZi9xMM=; b=Wenth gfrWl8eZf9EX9NGTEwrtq4VsqfLMu3j9AaP2pS8I85p3srAKxh25CwhTUalU/fgtggWBLmrvFSWZb k1Uw+VWOrZe1MVZtFZJOgqdjSi8w5kpRXpTDEaiWQMLZQeQMAXUZevRzjrsvDTJKob0iJHSN5aeLR dpjybQl4GnknhoM3e71nHY4bhZFgRPkeN+51Ox9TN+9UlyID4UB72g/t5mVYPHRhdJysD4QcM9veY H8pxkdnvZbF0MCiOsXYaxT6AZfiFamxSilDRxMs9xkPTknSqLLiU26d7QN0n17u5A+THlto+Xr9LR SvuElIU0uECLA8Y4YKi90slaqvZRw==; Message-Id: <4c01b2caa5f5b54a2020fc92701deadd2abf0571.1664917004.git.qemu_oss@crudebyte.com> In-Reply-To: References: From: Christian Schoenebeck Date: Tue, 4 Oct 2022 22:54:09 +0200 Subject: [PATCH 16/20] tests/9p: merge v9fs_tlcreate() and do_lcreate() 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=4c01b2caa5f5b54a2020fc92701deadd2abf0571@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: 1664920309681100002 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" As with previous patches, unify those 2 functions into a single function v9fs_tlcreate() by using a declarative function arguments approach. Signed-off-by: Christian Schoenebeck --- tests/qtest/libqos/virtio-9p-client.c | 45 +++++++++++++++++++++------ tests/qtest/libqos/virtio-9p-client.h | 39 +++++++++++++++++++++-- tests/qtest/virtio-9p-test.c | 30 +++++------------- 3 files changed, 79 insertions(+), 35 deletions(-) diff --git a/tests/qtest/libqos/virtio-9p-client.c b/tests/qtest/libqos/vir= tio-9p-client.c index c374ba2048..5c805a133c 100644 --- a/tests/qtest/libqos/virtio-9p-client.c +++ b/tests/qtest/libqos/virtio-9p-client.c @@ -827,11 +827,26 @@ void v9fs_rmkdir(P9Req *req, v9fs_qid *qid) } =20 /* size[4] Tlcreate tag[2] fid[4] name[s] flags[4] mode[4] gid[4] */ -P9Req *v9fs_tlcreate(QVirtio9P *v9p, uint32_t fid, const char *name, - uint32_t flags, uint32_t mode, uint32_t gid, - uint16_t tag) +TlcreateRes v9fs_tlcreate(TlcreateOpt opt) { P9Req *req; + uint32_t err; + g_autofree char *name =3D g_strdup(opt.name); + + g_assert(opt.client); + /* expecting either hi-level atPath or low-level fid, but not both */ + g_assert(!opt.atPath || !opt.fid); + /* expecting either Rlcreate or Rlerror, but obviously not both */ + g_assert(!opt.expectErr || !(opt.rlcreate.qid || opt.rlcreate.iounit)); + + if (opt.atPath) { + opt.fid =3D v9fs_twalk((TWalkOpt) { .client =3D opt.client, + .path =3D opt.atPath }).newfid; + } + + if (!opt.mode) { + opt.mode =3D 0750; + } =20 uint32_t body_size =3D 4 + 4 + 4 + 4; uint16_t string_size =3D v9fs_string_size(name); @@ -839,14 +854,26 @@ P9Req *v9fs_tlcreate(QVirtio9P *v9p, uint32_t fid, co= nst char *name, g_assert_cmpint(body_size, <=3D, UINT32_MAX - string_size); body_size +=3D string_size; =20 - req =3D v9fs_req_init(v9p, body_size, P9_TLCREATE, tag); - v9fs_uint32_write(req, fid); + req =3D v9fs_req_init(opt.client, body_size, P9_TLCREATE, opt.tag); + v9fs_uint32_write(req, opt.fid); v9fs_string_write(req, name); - v9fs_uint32_write(req, flags); - v9fs_uint32_write(req, mode); - v9fs_uint32_write(req, gid); + v9fs_uint32_write(req, opt.flags); + v9fs_uint32_write(req, opt.mode); + v9fs_uint32_write(req, opt.gid); v9fs_req_send(req); - return req; + + if (!opt.requestOnly) { + v9fs_req_wait_for_reply(req, NULL); + if (opt.expectErr) { + v9fs_rlerror(req, &err); + g_assert_cmpint(err, =3D=3D, opt.expectErr); + } else { + v9fs_rlcreate(req, opt.rlcreate.qid, opt.rlcreate.iounit); + } + req =3D NULL; /* request was freed */ + } + + return (TlcreateRes) { .req =3D req }; } =20 /* size[4] Rlcreate tag[2] qid[13] iounit[4] */ diff --git a/tests/qtest/libqos/virtio-9p-client.h b/tests/qtest/libqos/vir= tio-9p-client.h index ae44f95a4d..8916b1c7aa 100644 --- a/tests/qtest/libqos/virtio-9p-client.h +++ b/tests/qtest/libqos/virtio-9p-client.h @@ -320,6 +320,41 @@ typedef struct TMkdirRes { P9Req *req; } TMkdirRes; =20 +/* options for 'Tlcreate' 9p request */ +typedef struct TlcreateOpt { + /* 9P client being used (mandatory) */ + QVirtio9P *client; + /* user supplied tag number being returned with response (optional) */ + uint16_t tag; + /* low-level variant of directory where new file shall be created */ + uint32_t fid; + /* high-level variant of directory where new file shall be created */ + const char *atPath; + /* name of new file (required) */ + const char *name; + /* Linux kernel intent bits */ + uint32_t flags; + /* Linux create(2) mode bits */ + uint32_t mode; + /* effective group ID of caller */ + uint32_t gid; + /* data being received from 9p server as 'Rlcreate' response (optional= ) */ + struct { + v9fs_qid *qid; + uint32_t *iounit; + } rlcreate; + /* only send Tlcreate request but not wait for a reply? (optional) */ + bool requestOnly; + /* do we expect an Rlerror response, if yes which error code? (optiona= l) */ + uint32_t expectErr; +} TlcreateOpt; + +/* result of 'Tlcreate' 9p request */ +typedef struct TlcreateRes { + /* if requestOnly was set: request object for further processing */ + P9Req *req; +} TlcreateRes; + void v9fs_set_allocator(QGuestAllocator *t_alloc); void v9fs_memwrite(P9Req *req, const void *addr, size_t len); void v9fs_memskip(P9Req *req, size_t len); @@ -361,9 +396,7 @@ TFlushRes v9fs_tflush(TFlushOpt); void v9fs_rflush(P9Req *req); TMkdirRes v9fs_tmkdir(TMkdirOpt); void v9fs_rmkdir(P9Req *req, v9fs_qid *qid); -P9Req *v9fs_tlcreate(QVirtio9P *v9p, uint32_t fid, const char *name, - uint32_t flags, uint32_t mode, uint32_t gid, - uint16_t tag); +TlcreateRes v9fs_tlcreate(TlcreateOpt); void v9fs_rlcreate(P9Req *req, v9fs_qid *qid, uint32_t *iounit); P9Req *v9fs_tsymlink(QVirtio9P *v9p, uint32_t fid, const char *name, const char *symtgt, uint32_t gid, uint16_t tag); diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c index 6d75afee87..d13b27bd2e 100644 --- a/tests/qtest/virtio-9p-test.c +++ b/tests/qtest/virtio-9p-test.c @@ -25,6 +25,7 @@ #define twrite(...) v9fs_twrite((TWriteOpt) __VA_ARGS__) #define tflush(...) v9fs_tflush((TFlushOpt) __VA_ARGS__) #define tmkdir(...) v9fs_tmkdir((TMkdirOpt) __VA_ARGS__) +#define tlcreate(...) v9fs_tlcreate((TlcreateOpt) __VA_ARGS__) =20 static void pci_config(void *obj, void *data, QGuestAllocator *t_alloc) { @@ -478,23 +479,6 @@ static void fs_flush_ignored(void *obj, void *data, QG= uestAllocator *t_alloc) g_free(wnames[0]); } =20 -/* create a regular file with Tlcreate and return file's fid */ -static uint32_t do_lcreate(QVirtio9P *v9p, const char *path, - const char *cname) -{ - g_autofree char *name =3D g_strdup(cname); - uint32_t fid; - P9Req *req; - - fid =3D twalk({ .client =3D v9p, .path =3D path }).newfid; - - req =3D v9fs_tlcreate(v9p, fid, name, 0, 0750, 0, 0); - v9fs_req_wait_for_reply(req, NULL); - v9fs_rlcreate(req, NULL, NULL); - - return fid; -} - /* create symlink named @a clink in directory @a path pointing to @a to */ static void do_symlink(QVirtio9P *v9p, const char *path, const char *clink, const char *to) @@ -615,7 +599,7 @@ static void fs_create_file(void *obj, void *data, QGues= tAllocator *t_alloc) =20 tattach({ .client =3D v9p }); tmkdir({ .client =3D v9p, .atPath =3D "/", .name =3D "03" }); - do_lcreate(v9p, "03", "1st_file"); + tlcreate({ .client =3D v9p, .atPath =3D "03", .name =3D "1st_file" }); =20 /* check if created file exists now ... */ g_assert(stat(new_file, &st) =3D=3D 0); @@ -632,7 +616,7 @@ static void fs_unlinkat_file(void *obj, void *data, QGu= estAllocator *t_alloc) =20 tattach({ .client =3D v9p }); tmkdir({ .client =3D v9p, .atPath =3D "/", .name =3D "04" }); - do_lcreate(v9p, "04", "doa_file"); + tlcreate({ .client =3D v9p, .atPath =3D "04", .name =3D "doa_file" }); =20 /* check if created file exists now ... */ g_assert(stat(new_file, &st) =3D=3D 0); @@ -654,7 +638,7 @@ static void fs_symlink_file(void *obj, void *data, QGue= stAllocator *t_alloc) =20 tattach({ .client =3D v9p }); tmkdir({ .client =3D v9p, .atPath =3D "/", .name =3D "05" }); - do_lcreate(v9p, "05", "real_file"); + tlcreate({ .client =3D v9p, .atPath =3D "05", .name =3D "real_file" }); g_assert(stat(real_file, &st) =3D=3D 0); g_assert((st.st_mode & S_IFMT) =3D=3D S_IFREG); =20 @@ -675,7 +659,7 @@ static void fs_unlinkat_symlink(void *obj, void *data, =20 tattach({ .client =3D v9p }); tmkdir({ .client =3D v9p, .atPath =3D "/", .name =3D "06" }); - do_lcreate(v9p, "06", "real_file"); + tlcreate({ .client =3D v9p, .atPath =3D "06", .name =3D "real_file" }); g_assert(stat(real_file, &st) =3D=3D 0); g_assert((st.st_mode & S_IFMT) =3D=3D S_IFREG); =20 @@ -697,7 +681,7 @@ static void fs_hardlink_file(void *obj, void *data, QGu= estAllocator *t_alloc) =20 tattach({ .client =3D v9p }); tmkdir({ .client =3D v9p, .atPath =3D "/", .name =3D "07" }); - do_lcreate(v9p, "07", "real_file"); + tlcreate({ .client =3D v9p, .atPath =3D "07", .name =3D "real_file" }); g_assert(stat(real_file, &st_real) =3D=3D 0); g_assert((st_real.st_mode & S_IFMT) =3D=3D S_IFREG); =20 @@ -722,7 +706,7 @@ static void fs_unlinkat_hardlink(void *obj, void *data, =20 tattach({ .client =3D v9p }); tmkdir({ .client =3D v9p, .atPath =3D "/", .name =3D "08" }); - do_lcreate(v9p, "08", "real_file"); + tlcreate({ .client =3D v9p, .atPath =3D "08", .name =3D "real_file" }); g_assert(stat(real_file, &st_real) =3D=3D 0); g_assert((st_real.st_mode & S_IFMT) =3D=3D S_IFREG); =20 --=20 2.30.2