system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-07-22 19:04:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests/9p: merge v9fs_tlcreate() and do_lcreate()

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

Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Message-Id: <4c01b2caa5f5b54a2020fc92701deadd2abf0571.1664917004.git.qemu_oss@crudebyte.com>
This commit is contained in:
Christian Schoenebeck 2022-10-04 22:54:09 +02:00
parent e11680102a
commit bd4660d49a
3 changed files with 79 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
tests/qtest/libqos/virtio-9p-client.c
View file

@ -827,11 +827,26 @@ void v9fs_rmkdir(P9Req *req, v9fs_qid *qid)
}
/* size[4] Tlcreate tag[2] fid[4] name[s] flags[4] mode[4] gid[4] */
P9Req *v9fs_tlcreate(QVirtio9P *v9p, uint32_t fid, const char *name,
uint32_t flags, uint32_t mode, uint32_t gid,
uint16_t tag)
TlcreateRes v9fs_tlcreate(TlcreateOpt opt)
{
P9Req *req;
uint32_t err;
g_autofree char *name = g_strdup(opt.name);
g_assert(opt.client);
/* expecting either hi-level atPath or low-level fid, but not both */
g_assert(!opt.atPath || !opt.fid);
/* expecting either Rlcreate or Rlerror, but obviously not both */
g_assert(!opt.expectErr || !(opt.rlcreate.qid || opt.rlcreate.iounit));
if (opt.atPath) {
opt.fid = v9fs_twalk((TWalkOpt) { .client = opt.client,
.path = opt.atPath }).newfid;
}
if (!opt.mode) {
opt.mode = 0750;
}
uint32_t body_size = 4 + 4 + 4 + 4;
uint16_t string_size = v9fs_string_size(name);
@ -839,14 +854,26 @@ P9Req *v9fs_tlcreate(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_TLCREATE, tag);
v9fs_uint32_write(req, fid);
req = v9fs_req_init(opt.client, body_size, P9_TLCREATE, opt.tag);
v9fs_uint32_write(req, opt.fid);
v9fs_string_write(req, name);
v9fs_uint32_write(req, flags);
v9fs_uint32_write(req, mode);
v9fs_uint32_write(req, gid);
v9fs_uint32_write(req, opt.flags);
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, ==, opt.expectErr);
} else {
v9fs_rlcreate(req, opt.rlcreate.qid, opt.rlcreate.iounit);
}
req = NULL; /* request was freed */
}
return (TlcreateRes) { .req = req };
}
/* size[4] Rlcreate tag[2] qid[13] iounit[4] */

39
tests/qtest/libqos/virtio-9p-client.h
View file

@ -320,6 +320,41 @@ typedef struct TMkdirRes {
P9Req *req;
} TMkdirRes;
/* options for 'Tlcreate' 9p request */
typedef struct TlcreateOpt {
/* 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 file shall be created */
uint32_t fid;
/* high-level variant of directory where new file shall be created */
const char *atPath;
/* name of new file (required) */
const char *name;
/* Linux kernel intent bits */
uint32_t flags;
/* Linux create(2) mode bits */
uint32_t mode;
/* effective group ID of caller */
uint32_t gid;
/* data being received from 9p server as 'Rlcreate' response (optional) */
struct {
v9fs_qid *qid;
uint32_t *iounit;
} rlcreate;
/* only send Tlcreate 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;
} TlcreateOpt;
/* result of 'Tlcreate' 9p request */
typedef struct TlcreateRes {
/* if requestOnly was set: request object for further processing */
P9Req *req;
} TlcreateRes;
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);
@ -361,9 +396,7 @@ TFlushRes v9fs_tflush(TFlushOpt);
void v9fs_rflush(P9Req *req);
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,
uint16_t tag);
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);

30
tests/qtest/virtio-9p-test.c
View file

@ -25,6 +25,7 @@
#define twrite(...) v9fs_twrite((TWriteOpt) __VA_ARGS__)
#define tflush(...) v9fs_tflush((TFlushOpt) __VA_ARGS__)
#define tmkdir(...) v9fs_tmkdir((TMkdirOpt) __VA_ARGS__)
#define tlcreate(...) v9fs_tlcreate((TlcreateOpt) __VA_ARGS__)
static void pci_config(void *obj, void *data, QGuestAllocator *t_alloc)
{
@ -478,23 +479,6 @@ static void fs_flush_ignored(void *obj, void *data, QGuestAllocator *t_alloc)
g_free(wnames[0]);
}
/* create a regular file with Tlcreate and return file's fid */
static uint32_t do_lcreate(QVirtio9P *v9p, const char *path,
const char *cname)
{
g_autofree char *name = g_strdup(cname);
uint32_t fid;
P9Req *req;
fid = twalk({ .client = v9p, .path = path }).newfid;
req = v9fs_tlcreate(v9p, fid, name, 0, 0750, 0, 0);
v9fs_req_wait_for_reply(req, NULL);
v9fs_rlcreate(req, NULL, NULL);
return fid;
}
/* 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)
@ -615,7 +599,7 @@ static void fs_create_file(void *obj, void *data, QGuestAllocator *t_alloc)
tattach({ .client = v9p });
tmkdir({ .client = v9p, .atPath = "/", .name = "03" });
do_lcreate(v9p, "03", "1st_file");
tlcreate({ .client = v9p, .atPath = "03", .name = "1st_file" });
/* check if created file exists now ... */
g_assert(stat(new_file, &st) == 0);
@ -632,7 +616,7 @@ static void fs_unlinkat_file(void *obj, void *data, QGuestAllocator *t_alloc)
tattach({ .client = v9p });
tmkdir({ .client = v9p, .atPath = "/", .name = "04" });
do_lcreate(v9p, "04", "doa_file");
tlcreate({ .client = v9p, .atPath = "04", .name = "doa_file" });
/* check if created file exists now ... */
g_assert(stat(new_file, &st) == 0);
@ -654,7 +638,7 @@ static void fs_symlink_file(void *obj, void *data, QGuestAllocator *t_alloc)
tattach({ .client = v9p });
tmkdir({ .client = v9p, .atPath = "/", .name = "05" });
do_lcreate(v9p, "05", "real_file");
tlcreate({ .client = v9p, .atPath = "05", .name = "real_file" });
g_assert(stat(real_file, &st) == 0);
g_assert((st.st_mode & S_IFMT) == S_IFREG);
@ -675,7 +659,7 @@ static void fs_unlinkat_symlink(void *obj, void *data,
tattach({ .client = v9p });
tmkdir({ .client = v9p, .atPath = "/", .name = "06" });
do_lcreate(v9p, "06", "real_file");
tlcreate({ .client = v9p, .atPath = "06", .name = "real_file" });
g_assert(stat(real_file, &st) == 0);
g_assert((st.st_mode & S_IFMT) == S_IFREG);
@ -697,7 +681,7 @@ static void fs_hardlink_file(void *obj, void *data, QGuestAllocator *t_alloc)
tattach({ .client = v9p });
tmkdir({ .client = v9p, .atPath = "/", .name = "07" });
do_lcreate(v9p, "07", "real_file");
tlcreate({ .client = v9p, .atPath = "07", .name = "real_file" });
g_assert(stat(real_file, &st_real) == 0);
g_assert((st_real.st_mode & S_IFMT) == S_IFREG);
@ -722,7 +706,7 @@ static void fs_unlinkat_hardlink(void *obj, void *data,
tattach({ .client = v9p });
tmkdir({ .client = v9p, .atPath = "/", .name = "08" });
do_lcreate(v9p, "08", "real_file");
tlcreate({ .client = v9p, .atPath = "08", .name = "real_file" });
g_assert(stat(real_file, &st_real) == 0);
g_assert((st_real.st_mode & S_IFMT) == S_IFREG);