ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/9pfs: simplify do_mkdir() 

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>
This commit is contained in:
Christian Schoenebeck 2020-10-21 14:06:53 +02:00
parent c1934f630c
commit 2001880522
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/qtest/virtio-9p-test.c
View File

@ -583,6 +583,23 @@ static void do_version(QVirtio9P *v9p)
g_free(server_version); 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) static void fs_version(void *obj, void *data, QGuestAllocator *t_alloc)
{ {
alloc = 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) static void do_mkdir(QVirtio9P *v9p, const char *path, const char *cname)
{ {
char **wnames;
char *const name = g_strdup(cname); char *const name = g_strdup(cname);
uint32_t fid;
P9Req *req; P9Req *req;
const uint32_t fid = genfid();
int nwnames = split(path, "/", &wnames); fid = do_walk(v9p, path);
req = v9fs_twalk(v9p, 0, fid, nwnames, wnames, 0);
v9fs_req_wait_for_reply(req, NULL);
v9fs_rwalk(req, NULL, NULL);
req = v9fs_tmkdir(v9p, fid, name, 0750, 0, 0); req = v9fs_tmkdir(v9p, fid, name, 0750, 0, 0);
v9fs_req_wait_for_reply(req, NULL); v9fs_req_wait_for_reply(req, NULL);
v9fs_rmkdir(req, NULL); v9fs_rmkdir(req, NULL);
g_free(name); g_free(name);
split_free(&wnames);
} }
static void fs_readdir_split_128(void *obj, void *data, static void fs_readdir_split_128(void *obj, void *data,