From nobody Tue Feb 10 07:22:46 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=1666611617; cv=none; d=zohomail.com; s=zohoarc; b=Ux9G8tzBE0ATAOkh1nIdvEMSA+d1xQd9cN+WdWff1O/s5H68SEicIjTZ6Q68M71Wt9H1TeI1yL7iMcTnYztYuwTeuYnH3F6W810pAVcQl4ODkxj8CKmHGsu7EyrpRNM7iDIBu7rvfRPKjKLKhyE53vh0+MZpI51icByuGMgu2Ic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666611617; 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=jUls6/y9esxRDFCxtCfStb+XE9xSYXdI6Fy1YzanfOw=; b=AcaKO/7pfYe3yopTEBGskLjHhYOlmiTfUEe1fjk0naJnYh7S7RBk2WctKbJYJY21GSed9sGJy9Ss3etvjhdRa7dgz/YPG/wyZFahajFPxbHRsjZasBFBCSolUc38B4R4iVTMZ1ZVTxV7nW7akh1y4YmGVhoJU4VciVzx1bxWT4k= 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 1666611617167337.17232549795835; Mon, 24 Oct 2022 04:40:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omvN9-00015W-9e; Mon, 24 Oct 2022 07:11:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1omvN7-00014D-7o for qemu-devel@nongnu.org; Mon, 24 Oct 2022 07:11:57 -0400 Received: from lizzy.crudebyte.com ([91.194.90.13]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1omvN5-0007WF-65 for qemu-devel@nongnu.org; Mon, 24 Oct 2022 07:11:57 -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=jUls6/y9esxRDFCxtCfStb+XE9xSYXdI6Fy1YzanfOw=; b=Upjy8 xFSbBPdKt2GiWlN50Ctj1Kgvakm4go8+uOjbQGxIYTlj8yjTHK0rHjmXyKI/coJUdRLMuVSC7VluL yJ+qciH9CKzib3dOddmuNPgJ8gIr5tKcWZmSZStEAMWRA38jWWpHNxbyzepe4E4tc2BqzFoKj7QFc 2CCxYGRG3+9AjPJly8D5NArmpc2Pb818cyKyZXB9pt/KUMAb/kpsLLfLTvBG724oZavU/ozkzOq7y NJ/P6OyrtMr6e2DTbdRSifyHQmYAOgJXKIcbC/3iaq9GwoH0q9H62k7VDcPo1h3pgIkPafwft1Hwi uxHfHZJwF9HFJZZzGY8etEL4onv5g==; Message-Id: In-Reply-To: References: From: Christian Schoenebeck Date: Mon, 24 Oct 2022 12:54:23 +0200 Subject: [PULL 18/23] tests/9p: merge v9fs_tmkdir() and do_mkdir() To: qemu-devel@nongnu.org, Stefan Hajnoczi 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=e11680102af6a9f42ab198a77015696820a1993e@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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @crudebyte.com) X-ZM-MESSAGEID: 1666611617915100003 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_tmkdir() by using a declarative function arguments approach. Signed-off-by: Christian Schoenebeck Message-Id: --- tests/qtest/libqos/virtio-9p-client.c | 42 ++++++++++++++++++++++----- tests/qtest/libqos/virtio-9p-client.h | 36 +++++++++++++++++++++-- tests/qtest/virtio-9p-test.c | 30 ++++++------------- 3 files changed, 78 insertions(+), 30 deletions(-) diff --git a/tests/qtest/libqos/virtio-9p-client.c b/tests/qtest/libqos/vir= tio-9p-client.c index 3be0ffc7da..c374ba2048 100644 --- a/tests/qtest/libqos/virtio-9p-client.c +++ b/tests/qtest/libqos/virtio-9p-client.c @@ -766,10 +766,26 @@ void v9fs_rflush(P9Req *req) } =20 /* size[4] Tmkdir tag[2] dfid[4] name[s] mode[4] gid[4] */ -P9Req *v9fs_tmkdir(QVirtio9P *v9p, uint32_t dfid, const char *name, - uint32_t mode, uint32_t gid, uint16_t tag) +TMkdirRes v9fs_tmkdir(TMkdirOpt 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 dfid, but not both */ + g_assert(!opt.atPath || !opt.dfid); + /* expecting either Rmkdir or Rlerror, but obviously not both */ + g_assert(!opt.expectErr || !opt.rmkdir.qid); + + if (opt.atPath) { + opt.dfid =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; uint16_t string_size =3D v9fs_string_size(name); @@ -777,13 +793,25 @@ P9Req *v9fs_tmkdir(QVirtio9P *v9p, uint32_t dfid, con= st 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_TMKDIR, tag); - v9fs_uint32_write(req, dfid); + req =3D v9fs_req_init(opt.client, body_size, P9_TMKDIR, opt.tag); + v9fs_uint32_write(req, opt.dfid); v9fs_string_write(req, name); - v9fs_uint32_write(req, mode); - v9fs_uint32_write(req, gid); + 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_rmkdir(req, opt.rmkdir.qid); + } + req =3D NULL; /* request was freed */ + } + + return (TMkdirRes) { .req =3D req }; } =20 /* size[4] Rmkdir tag[2] qid[13] */ diff --git a/tests/qtest/libqos/virtio-9p-client.h b/tests/qtest/libqos/vir= tio-9p-client.h index b22b54c720..ae44f95a4d 100644 --- a/tests/qtest/libqos/virtio-9p-client.h +++ b/tests/qtest/libqos/virtio-9p-client.h @@ -287,6 +287,39 @@ typedef struct TFlushRes { P9Req *req; } TFlushRes; =20 +/* options for 'Tmkdir' 9p request */ +typedef struct TMkdirOpt { + /* 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 one shall be created */ + uint32_t dfid; + /* high-level variant of directory where new one shall be created */ + const char *atPath; + /* New directory's name (required) */ + const char *name; + /* Linux mkdir(2) mode bits (optional) */ + uint32_t mode; + /* effective group ID of caller */ + uint32_t gid; + /* data being received from 9p server as 'Rmkdir' response (optional) = */ + struct { + /* QID of newly created directory */ + v9fs_qid *qid; + } rmkdir; + /* only send Tmkdir 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; +} TMkdirOpt; + +/* result of 'TMkdir' 9p request */ +typedef struct TMkdirRes { + /* if requestOnly was set: request object for further processing */ + P9Req *req; +} TMkdirRes; + 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); @@ -326,8 +359,7 @@ TWriteRes v9fs_twrite(TWriteOpt); void v9fs_rwrite(P9Req *req, uint32_t *count); TFlushRes v9fs_tflush(TFlushOpt); void v9fs_rflush(P9Req *req); -P9Req *v9fs_tmkdir(QVirtio9P *v9p, uint32_t dfid, const char *name, - uint32_t mode, uint32_t gid, uint16_t tag); +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, diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c index 5544998bac..6d75afee87 100644 --- a/tests/qtest/virtio-9p-test.c +++ b/tests/qtest/virtio-9p-test.c @@ -24,6 +24,7 @@ #define tlopen(...) v9fs_tlopen((TLOpenOpt) __VA_ARGS__) #define twrite(...) v9fs_twrite((TWriteOpt) __VA_ARGS__) #define tflush(...) v9fs_tflush((TFlushOpt) __VA_ARGS__) +#define tmkdir(...) v9fs_tmkdir((TMkdirOpt) __VA_ARGS__) =20 static void pci_config(void *obj, void *data, QGuestAllocator *t_alloc) { @@ -477,19 +478,6 @@ static void fs_flush_ignored(void *obj, void *data, QG= uestAllocator *t_alloc) g_free(wnames[0]); } =20 -static void do_mkdir(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_tmkdir(v9p, fid, name, 0750, 0, 0); - v9fs_req_wait_for_reply(req, NULL); - v9fs_rmkdir(req, NULL); -} - /* create a regular file with Tlcreate and return file's fid */ static uint32_t do_lcreate(QVirtio9P *v9p, const char *path, const char *cname) @@ -587,7 +575,7 @@ static void fs_create_dir(void *obj, void *data, QGuest= Allocator *t_alloc) g_assert(root_path !=3D NULL); =20 tattach({ .client =3D v9p }); - do_mkdir(v9p, "/", "01"); + tmkdir({ .client =3D v9p, .atPath =3D "/", .name =3D "01" }); =20 /* check if created directory really exists now ... */ g_assert(stat(new_dir, &st) =3D=3D 0); @@ -606,7 +594,7 @@ static void fs_unlinkat_dir(void *obj, void *data, QGue= stAllocator *t_alloc) g_assert(root_path !=3D NULL); =20 tattach({ .client =3D v9p }); - do_mkdir(v9p, "/", "02"); + tmkdir({ .client =3D v9p, .atPath =3D "/", .name =3D "02" }); =20 /* check if created directory really exists now ... */ g_assert(stat(new_dir, &st) =3D=3D 0); @@ -626,7 +614,7 @@ static void fs_create_file(void *obj, void *data, QGues= tAllocator *t_alloc) g_autofree char *new_file =3D virtio_9p_test_path("03/1st_file"); =20 tattach({ .client =3D v9p }); - do_mkdir(v9p, "/", "03"); + tmkdir({ .client =3D v9p, .atPath =3D "/", .name =3D "03" }); do_lcreate(v9p, "03", "1st_file"); =20 /* check if created file exists now ... */ @@ -643,7 +631,7 @@ static void fs_unlinkat_file(void *obj, void *data, QGu= estAllocator *t_alloc) g_autofree char *new_file =3D virtio_9p_test_path("04/doa_file"); =20 tattach({ .client =3D v9p }); - do_mkdir(v9p, "/", "04"); + tmkdir({ .client =3D v9p, .atPath =3D "/", .name =3D "04" }); do_lcreate(v9p, "04", "doa_file"); =20 /* check if created file exists now ... */ @@ -665,7 +653,7 @@ static void fs_symlink_file(void *obj, void *data, QGue= stAllocator *t_alloc) g_autofree char *symlink_file =3D virtio_9p_test_path("05/symlink_file= "); =20 tattach({ .client =3D v9p }); - do_mkdir(v9p, "/", "05"); + tmkdir({ .client =3D v9p, .atPath =3D "/", .name =3D "05" }); do_lcreate(v9p, "05", "real_file"); g_assert(stat(real_file, &st) =3D=3D 0); g_assert((st.st_mode & S_IFMT) =3D=3D S_IFREG); @@ -686,7 +674,7 @@ static void fs_unlinkat_symlink(void *obj, void *data, g_autofree char *symlink_file =3D virtio_9p_test_path("06/symlink_file= "); =20 tattach({ .client =3D v9p }); - do_mkdir(v9p, "/", "06"); + tmkdir({ .client =3D v9p, .atPath =3D "/", .name =3D "06" }); do_lcreate(v9p, "06", "real_file"); g_assert(stat(real_file, &st) =3D=3D 0); g_assert((st.st_mode & S_IFMT) =3D=3D S_IFREG); @@ -708,7 +696,7 @@ static void fs_hardlink_file(void *obj, void *data, QGu= estAllocator *t_alloc) g_autofree char *hardlink_file =3D virtio_9p_test_path("07/hardlink_fi= le"); =20 tattach({ .client =3D v9p }); - do_mkdir(v9p, "/", "07"); + tmkdir({ .client =3D v9p, .atPath =3D "/", .name =3D "07" }); do_lcreate(v9p, "07", "real_file"); g_assert(stat(real_file, &st_real) =3D=3D 0); g_assert((st_real.st_mode & S_IFMT) =3D=3D S_IFREG); @@ -733,7 +721,7 @@ static void fs_unlinkat_hardlink(void *obj, void *data, g_autofree char *hardlink_file =3D virtio_9p_test_path("08/hardlink_fi= le"); =20 tattach({ .client =3D v9p }); - do_mkdir(v9p, "/", "08"); + tmkdir({ .client =3D v9p, .atPath =3D "/", .name =3D "08" }); do_lcreate(v9p, "08", "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 2.30.2