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

tests/9p: merge v9fs_tsymlink() and do_symlink() 

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

Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Message-Id: <563f3ad04fe596ce0ae1e2654d1d08237f18c830.1664917004.git.qemu_oss@crudebyte.com>
This commit is contained in:
Christian Schoenebeck 2022-10-04 22:54:11 +02:00
parent bd4660d49a
commit 9beabfa52c
3 changed files with 73 additions and 26 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

@ -892,10 +892,23 @@ void v9fs_rlcreate(P9Req *req, v9fs_qid *qid, uint32_t *iounit)
}
/* size[4] Tsymlink tag[2] fid[4] name[s] symtgt[s] gid[4] */
P9Req *v9fs_tsymlink(QVirtio9P *v9p, uint32_t fid, const char *name,
const char *symtgt, uint32_t gid, uint16_t tag)
TsymlinkRes v9fs_tsymlink(TsymlinkOpt opt)
{
P9Req *req;
uint32_t err;
g_autofree char *name = g_strdup(opt.name);
g_autofree char *symtgt = g_strdup(opt.symtgt);
g_assert(opt.client);
/* expecting either hi-level atPath or low-level fid, but not both */
g_assert(!opt.atPath || !opt.fid);
/* expecting either Rsymlink or Rlerror, but obviously not both */
g_assert(!opt.expectErr || !opt.rsymlink.qid);
if (opt.atPath) {
opt.fid = v9fs_twalk((TWalkOpt) { .client = opt.client,
.path = opt.atPath }).newfid;
}
uint32_t body_size = 4 + 4;
uint16_t string_size = v9fs_string_size(name) + v9fs_string_size(symtgt);
@ -903,13 +916,25 @@ P9Req *v9fs_tsymlink(QVirtio9P *v9p, uint32_t fid, const char *name,
g_assert_cmpint(body_size, <=, UINT32_MAX - string_size);
body_size += string_size;
req = v9fs_req_init(v9p, body_size, P9_TSYMLINK, tag);
v9fs_uint32_write(req, fid);
req = v9fs_req_init(opt.client, body_size, P9_TSYMLINK, opt.tag);
v9fs_uint32_write(req, opt.fid);
v9fs_string_write(req, name);
v9fs_string_write(req, symtgt);
v9fs_uint32_write(req, gid);
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, ==, opt.expectErr);
} else {
v9fs_rsymlink(req, opt.rsymlink.qid);
}
req = NULL; /* request was freed */
}
return (TsymlinkRes) { .req = req };
}
/* size[4] Rsymlink tag[2] qid[13] */

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

@ -355,6 +355,38 @@ typedef struct TlcreateRes {
P9Req *req;
} TlcreateRes;
/* options for 'Tsymlink' 9p request */
typedef struct TsymlinkOpt {
/* 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 symlink shall be created */
uint32_t fid;
/* high-level variant of directory where symlink shall be created */
const char *atPath;
/* name of symlink (required) */
const char *name;
/* where symlink will point to (required) */
const char *symtgt;
/* effective group ID of caller */
uint32_t gid;
/* data being received from 9p server as 'Rsymlink' response (optional) */
struct {
v9fs_qid *qid;
} rsymlink;
/* only send Tsymlink 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;
} TsymlinkOpt;
/* result of 'Tsymlink' 9p request */
typedef struct TsymlinkRes {
/* if requestOnly was set: request object for further processing */
P9Req *req;
} TsymlinkRes;
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);
@ -398,8 +430,7 @@ TMkdirRes v9fs_tmkdir(TMkdirOpt);
void v9fs_rmkdir(P9Req *req, v9fs_qid *qid);
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);
TsymlinkRes v9fs_tsymlink(TsymlinkOpt);
void v9fs_rsymlink(P9Req *req, v9fs_qid *qid);
P9Req *v9fs_tlink(QVirtio9P *v9p, uint32_t dfid, uint32_t fid,
const char *name, uint16_t tag);

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

@ -26,6 +26,7 @@
#define tflush(...) v9fs_tflush((TFlushOpt) __VA_ARGS__)
#define tmkdir(...) v9fs_tmkdir((TMkdirOpt) __VA_ARGS__)
#define tlcreate(...) v9fs_tlcreate((TlcreateOpt) __VA_ARGS__)
#define tsymlink(...) v9fs_tsymlink((TsymlinkOpt) __VA_ARGS__)
static void pci_config(void *obj, void *data, QGuestAllocator *t_alloc)
{
@ -479,22 +480,6 @@ static void fs_flush_ignored(void *obj, void *data, QGuestAllocator *t_alloc)
g_free(wnames[0]);
}
/* 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)
{
g_autofree char *name = g_strdup(clink);
g_autofree char *dst = g_strdup(to);
uint32_t fid;
P9Req *req;
fid = twalk({ .client = v9p, .path = path }).newfid;
req = v9fs_tsymlink(v9p, fid, name, dst, 0, 0);
v9fs_req_wait_for_reply(req, NULL);
v9fs_rsymlink(req, NULL);
}
/* create a hard link named @a clink in directory @a path pointing to @a to */
static void do_hardlink(QVirtio9P *v9p, const char *path, const char *clink,
const char *to)
@ -642,7 +627,10 @@ static void fs_symlink_file(void *obj, void *data, QGuestAllocator *t_alloc)
g_assert(stat(real_file, &st) == 0);
g_assert((st.st_mode & S_IFMT) == S_IFREG);
do_symlink(v9p, "05", "symlink_file", "real_file");
tsymlink({
.client = v9p, .atPath = "05", .name = "symlink_file",
.symtgt = "real_file"
});
/* check if created link exists now */
g_assert(stat(symlink_file, &st) == 0);
@ -663,7 +651,10 @@ static void fs_unlinkat_symlink(void *obj, void *data,
g_assert(stat(real_file, &st) == 0);
g_assert((st.st_mode & S_IFMT) == S_IFREG);
do_symlink(v9p, "06", "symlink_file", "real_file");
tsymlink({
.client = v9p, .atPath = "06", .name = "symlink_file",
.symtgt = "real_file"
});
g_assert(stat(symlink_file, &st) == 0);
do_unlinkat(v9p, "06", "symlink_file", 0);