[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v3 10/17] tests/9pfs: simplify do_mkdir()
From: |
Christian Schoenebeck |
Subject: |
[PULL v3 10/17] tests/9pfs: simplify do_mkdir() |
Date: |
Wed, 21 Oct 2020 14:06:53 +0200 |
Split out walking a directory path to a separate new utility function
do_walk() and use that function in do_mkdir().
The code difference saved this way is not much, but we'll use that new
do_walk() function in the upcoming patches, so it will avoid quite
some code duplication after all.
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Message-Id:
<4d7275b2363f122438a443ce079cbb355285e9d6.1603285620.git.qemu_oss@crudebyte.com>
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
---
tests/qtest/virtio-9p-test.c | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c
index 6f8c46a645..db37e31b32 100644
--- a/tests/qtest/virtio-9p-test.c
+++ b/tests/qtest/virtio-9p-test.c
@@ -583,6 +583,23 @@ static void do_version(QVirtio9P *v9p)
g_free(server_version);
}
+/* utility function: walk to requested dir and return fid for that dir */
+static uint32_t do_walk(QVirtio9P *v9p, const char *path)
+{
+ char **wnames;
+ P9Req *req;
+ const uint32_t fid = genfid();
+
+ int nwnames = split(path, "/", &wnames);
+
+ req = v9fs_twalk(v9p, 0, fid, nwnames, wnames, 0);
+ v9fs_req_wait_for_reply(req, NULL);
+ v9fs_rwalk(req, NULL, NULL);
+
+ split_free(&wnames);
+ return fid;
+}
+
static void fs_version(void *obj, void *data, QGuestAllocator *t_alloc)
{
alloc = t_alloc;
@@ -974,23 +991,17 @@ static void fs_flush_ignored(void *obj, void *data,
QGuestAllocator *t_alloc)
static void do_mkdir(QVirtio9P *v9p, const char *path, const char *cname)
{
- char **wnames;
char *const name = g_strdup(cname);
+ uint32_t fid;
P9Req *req;
- const uint32_t fid = genfid();
- int nwnames = split(path, "/", &wnames);
-
- req = v9fs_twalk(v9p, 0, fid, nwnames, wnames, 0);
- v9fs_req_wait_for_reply(req, NULL);
- v9fs_rwalk(req, NULL, NULL);
+ fid = do_walk(v9p, path);
req = v9fs_tmkdir(v9p, fid, name, 0750, 0, 0);
v9fs_req_wait_for_reply(req, NULL);
v9fs_rmkdir(req, NULL);
g_free(name);
- split_free(&wnames);
}
static void fs_readdir_split_128(void *obj, void *data,
--
2.20.1
- [PULL v3 00/17] 9p queue (previous 2020-10-30), Christian Schoenebeck, 2020/11/02
- [PULL v3 01/17] tests/9pfs: make create/remove test dir public, Christian Schoenebeck, 2020/11/02
- [PULL v3 02/17] tests/9pfs: fix test dir for parallel tests, Christian Schoenebeck, 2020/11/02
- [PULL v3 03/17] tests/9pfs: fix coverity error in create_local_test_dir(), Christian Schoenebeck, 2020/11/02
- [PULL v3 04/17] tests/9pfs: Force removing of local 9pfs test directory, Christian Schoenebeck, 2020/11/02
- [PULL v3 05/17] tests/9pfs: Factor out do_version() helper, Christian Schoenebeck, 2020/11/02
- [PULL v3 06/17] tests/9pfs: Set alloc in fs_create_dir(), Christian Schoenebeck, 2020/11/02
- [PULL v3 07/17] tests/9pfs: Factor out do_attach() helper, Christian Schoenebeck, 2020/11/02
- [PULL v3 08/17] tests/9pfs: Turn fs_readdir_split() into a helper, Christian Schoenebeck, 2020/11/02
- [PULL v3 09/17] tests/9pfs: Turn fs_mkdir() into a helper, Christian Schoenebeck, 2020/11/02
- [PULL v3 10/17] tests/9pfs: simplify do_mkdir(),
Christian Schoenebeck <=
- [PULL v3 11/17] tests/9pfs: add local Tunlinkat directory test, Christian Schoenebeck, 2020/11/02
- [PULL v3 12/17] tests/9pfs: add local Tlcreate test, Christian Schoenebeck, 2020/11/02
- [PULL v3 13/17] tests/9pfs: add local Tunlinkat file test, Christian Schoenebeck, 2020/11/02
- [PULL v3 14/17] tests/9pfs: add local Tsymlink test, Christian Schoenebeck, 2020/11/02
- [PULL v3 15/17] tests/9pfs: add local Tunlinkat symlink test, Christian Schoenebeck, 2020/11/02
- [PULL v3 16/17] tests/9pfs: add local Tlink test, Christian Schoenebeck, 2020/11/02
- [PULL v3 17/17] tests/9pfs: add local Tunlinkat hard link test, Christian Schoenebeck, 2020/11/02
- Re: [PULL v3 00/17] 9p queue (previous 2020-10-30), Peter Maydell, 2020/11/02