OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/9p: merge v9fs_tunlinkat() and do_unlinkat()

Browse Source 
As with previous patches, unify those 2 functions into a single function
v9fs_tunlinkat() by using a declarative function arguments approach.

Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Message-Id: <1dea593edd464908d92501933c068388c01f1744.1664917004.git.qemu_oss@crudebyte.com>
This commit is contained in:
Christian Schoenebeck 2022-10-04 22:54:16 +02:00
parent d41a9462ea
commit 43e0d9fb35
3 changed files with 64 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tests/qtest/libqos/virtio-9p-client.c
View File

@ -1004,23 +1004,44 @@ void v9fs_rlink(P9Req *req)
}
/* size[4] Tunlinkat tag[2] dirfd[4] name[s] flags[4] */
P9Req *v9fs_tunlinkat(QVirtio9P *v9p, uint32_t dirfd, const char *name,
uint32_t flags, uint16_t tag)
TunlinkatRes v9fs_tunlinkat(TunlinkatOpt opt)
{
P9Req *req;
uint32_t err;
g_assert(opt.client);
/* expecting either hi-level atPath or low-level dirfd, but not both */
g_assert(!opt.atPath || !opt.dirfd);
if (opt.atPath) {
opt.dirfd = v9fs_twalk((TWalkOpt) { .client = opt.client,
.path = opt.atPath }).newfid;
}
uint32_t body_size = 4 + 4;
uint16_t string_size = v9fs_string_size(name);
uint16_t string_size = v9fs_string_size(opt.name);
g_assert_cmpint(body_size, <=, UINT32_MAX - string_size);
body_size += string_size;
req = v9fs_req_init(v9p, body_size, P9_TUNLINKAT, tag);
v9fs_uint32_write(req, dirfd);
v9fs_string_write(req, name);
v9fs_uint32_write(req, flags);
req = v9fs_req_init(opt.client, body_size, P9_TUNLINKAT, opt.tag);
v9fs_uint32_write(req, opt.dirfd);
v9fs_string_write(req, opt.name);
v9fs_uint32_write(req, opt.flags);
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, ==, opt.expectErr);
} else {
v9fs_runlinkat(req);
}
req = NULL; /* request was freed */
}
return (TunlinkatRes) { .req = req };
}
/* size[4] Runlinkat tag[2] */

29
tests/qtest/libqos/virtio-9p-client.h
View File

@ -415,6 +415,32 @@ typedef struct TlinkRes {
P9Req *req;
} TlinkRes;
/* options for 'Tunlinkat' 9p request */
typedef struct TunlinkatOpt {
/* 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 name shall be unlinked */
uint32_t dirfd;
/* high-level variant of directory where name shall be unlinked */
const char *atPath;
/* name of directory entry to be unlinked (required) */
const char *name;
/* Linux unlinkat(2) flags */
uint32_t flags;
/* only send Tunlinkat request but not wait for a reply? (optional) */
bool requestOnly;
/* do we expect an Rlerror response, if yes which error code? (optional) */
uint32_t expectErr;
} TunlinkatOpt;
/* result of 'Tunlinkat' 9p request */
typedef struct TunlinkatRes {
/* if requestOnly was set: request object for further processing */
P9Req *req;
} TunlinkatRes;
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);
@ -462,8 +488,7 @@ TsymlinkRes v9fs_tsymlink(TsymlinkOpt);
void v9fs_rsymlink(P9Req *req, v9fs_qid *qid);
TlinkRes v9fs_tlink(TlinkOpt);
void v9fs_rlink(P9Req *req);
P9Req *v9fs_tunlinkat(QVirtio9P *v9p, uint32_t dirfd, const char *name,
uint32_t flags, uint16_t tag);
TunlinkatRes v9fs_tunlinkat(TunlinkatOpt);
void v9fs_runlinkat(P9Req *req);
#endif

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

@ -28,6 +28,7 @@
#define tlcreate(...) v9fs_tlcreate((TlcreateOpt) __VA_ARGS__)
#define tsymlink(...) v9fs_tsymlink((TsymlinkOpt) __VA_ARGS__)
#define tlink(...) v9fs_tlink((TlinkOpt) __VA_ARGS__)
#define tunlinkat(...) v9fs_tunlinkat((TunlinkatOpt) __VA_ARGS__)
static void pci_config(void *obj, void *data, QGuestAllocator *t_alloc)
{
@ -481,20 +482,6 @@ static void fs_flush_ignored(void *obj, void *data, QGuestAllocator *t_alloc)
g_free(wnames[0]);
}
static void do_unlinkat(QVirtio9P *v9p, const char *atpath, const char *rpath,
uint32_t flags)
{
g_autofree char *name = g_strdup(rpath);
uint32_t fid;
P9Req *req;
fid = twalk({ .client = v9p, .path = atpath }).newfid;
req = v9fs_tunlinkat(v9p, fid, name, flags, 0);
v9fs_req_wait_for_reply(req, NULL);
v9fs_runlinkat(req);
}
static void fs_readdir_split_128(void *obj, void *data,
QGuestAllocator *t_alloc)
{
@ -556,7 +543,10 @@ static void fs_unlinkat_dir(void *obj, void *data, QGuestAllocator *t_alloc)
/* ... and is actually a directory */
g_assert((st.st_mode & S_IFMT) == S_IFDIR);
do_unlinkat(v9p, "/", "02", P9_DOTL_AT_REMOVEDIR);
tunlinkat({
.client = v9p, .atPath = "/", .name = "02",
.flags = P9_DOTL_AT_REMOVEDIR
});
/* directory should be gone now */
g_assert(stat(new_dir, &st) != 0);
}
@ -594,7 +584,7 @@ static void fs_unlinkat_file(void *obj, void *data, QGuestAllocator *t_alloc)
/* ... and is a regular file */
g_assert((st.st_mode & S_IFMT) == S_IFREG);
do_unlinkat(v9p, "04", "doa_file", 0);
tunlinkat({ .client = v9p, .atPath = "04", .name = "doa_file" });
/* file should be gone now */
g_assert(stat(new_file, &st) != 0);
}
@ -643,7 +633,7 @@ static void fs_unlinkat_symlink(void *obj, void *data,
});
g_assert(stat(symlink_file, &st) == 0);
do_unlinkat(v9p, "06", "symlink_file", 0);
tunlinkat({ .client = v9p, .atPath = "06", .name = "symlink_file" });
/* symlink should be gone now */
g_assert(stat(symlink_file, &st) != 0);
}
@ -696,7 +686,7 @@ static void fs_unlinkat_hardlink(void *obj, void *data,
});
g_assert(stat(hardlink_file, &st_link) == 0);
do_unlinkat(v9p, "08", "hardlink_file", 0);
tunlinkat({ .client = v9p, .atPath = "08", .name = "hardlink_file" });
/* symlink should be gone now */
g_assert(stat(hardlink_file, &st_link) != 0);
/* and old file should still exist */