mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/9p: convert v9fs_tlopen() to declarative arguments

Browse Source 
Use declarative function arguments for function v9fs_tlopen().

Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Message-Id: <765ab515353c56f88f0a163631f626a44e9565d6.1664917004.git.qemu_oss@crudebyte.com>
This commit is contained in:
Christian Schoenebeck 2022-10-04 22:53:52 +02:00
parent a9a5376931
commit 3878ce4cc2
3 changed files with 69 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -643,16 +643,32 @@ void v9fs_free_dirents(struct V9fsDirent *e)
}
/* size[4] Tlopen tag[2] fid[4] flags[4] */
P9Req *v9fs_tlopen(QVirtio9P *v9p, uint32_t fid, uint32_t flags,
uint16_t tag)
TLOpenRes v9fs_tlopen(TLOpenOpt opt)
{
P9Req *req;
uint32_t err;
req = v9fs_req_init(v9p, 4 + 4, P9_TLOPEN, tag);
v9fs_uint32_write(req, fid);
v9fs_uint32_write(req, flags);
g_assert(opt.client);
/* expecting either Rlopen or Rlerror, but obviously not both */
g_assert(!opt.expectErr || !(opt.rlopen.qid || opt.rlopen.iounit));
req = v9fs_req_init(opt.client, 4 + 4, P9_TLOPEN, opt.tag);
v9fs_uint32_write(req, opt.fid);
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_rlopen(req, opt.rlopen.qid, opt.rlopen.iounit);
}
req = NULL; /* request was freed */
}
return (TLOpenRes) { .req = req };
}
/* size[4] Rlopen tag[2] qid[13] iounit[4] */

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

@ -212,6 +212,33 @@ typedef struct TReadDirRes {
P9Req *req;
} TReadDirRes;
/* options for 'Tlopen' 9p request */
typedef struct TLOpenOpt {
/* 9P client being used (mandatory) */
QVirtio9P *client;
/* user supplied tag number being returned with response (optional) */
uint16_t tag;
/* file ID of file / directory to be opened (required) */
uint32_t fid;
/* Linux open(2) flags such as O_RDONLY, O_RDWR, O_WRONLY (optional) */
uint32_t flags;
/* data being received from 9p server as 'Rlopen' response (optional) */
struct {
v9fs_qid *qid;
uint32_t *iounit;
} rlopen;
/* only send Tlopen 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;
} TLOpenOpt;
/* result of 'Tlopen' 9p request */
typedef struct TLOpenRes {
/* if requestOnly was set: request object for further processing */
P9Req *req;
} TLOpenRes;
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);
@ -245,8 +272,7 @@ TReadDirRes v9fs_treaddir(TReadDirOpt);
void v9fs_rreaddir(P9Req *req, uint32_t *count, uint32_t *nentries,
struct V9fsDirent **entries);
void v9fs_free_dirents(struct V9fsDirent *e);
P9Req *v9fs_tlopen(QVirtio9P *v9p, uint32_t fid, uint32_t flags,
uint16_t tag);
TLOpenRes v9fs_tlopen(TLOpenOpt);
void v9fs_rlopen(P9Req *req, v9fs_qid *qid, uint32_t *iounit);
P9Req *v9fs_twrite(QVirtio9P *v9p, uint32_t fid, uint64_t offset,
uint32_t count, const void *data, uint16_t tag);

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

@ -21,6 +21,7 @@
#define tattach(...) v9fs_tattach((TAttachOpt) __VA_ARGS__)
#define tgetattr(...) v9fs_tgetattr((TGetAttrOpt) __VA_ARGS__)
#define treaddir(...) v9fs_treaddir((TReadDirOpt) __VA_ARGS__)
#define tlopen(...) v9fs_tlopen((TLOpenOpt) __VA_ARGS__)
static void pci_config(void *obj, void *data, QGuestAllocator *t_alloc)
{
@ -113,7 +114,9 @@ static void fs_readdir(void *obj, void *data, QGuestAllocator *t_alloc)
});
g_assert_cmpint(nqid, ==, 1);
req = v9fs_tlopen(v9p, 1, O_DIRECTORY, 0);
req = tlopen({
.client = v9p, .fid = 1, .flags = O_DIRECTORY, .requestOnly = true
}).req;
v9fs_req_wait_for_reply(req, NULL);
v9fs_rlopen(req, &qid, NULL);
@ -178,7 +181,9 @@ static void do_readdir_split(QVirtio9P *v9p, uint32_t count)
});
g_assert_cmpint(nqid, ==, 1);
req = v9fs_tlopen(v9p, fid, O_DIRECTORY, 0);
req = tlopen({
.client = v9p, .fid = fid, .flags = O_DIRECTORY, .requestOnly = true
}).req;
v9fs_req_wait_for_reply(req, NULL);
v9fs_rlopen(req, &qid, NULL);
@ -365,7 +370,9 @@ static void fs_lopen(void *obj, void *data, QGuestAllocator *t_alloc)
.client = v9p, .fid = 0, .newfid = 1, .nwname = 1, .wnames = wnames
});
req = v9fs_tlopen(v9p, 1, O_WRONLY, 0);
req = tlopen({
.client = v9p, .fid = 1, .flags = O_WRONLY, .requestOnly = true
}).req;
v9fs_req_wait_for_reply(req, NULL);
v9fs_rlopen(req, NULL, NULL);
@ -387,7 +394,9 @@ static void fs_write(void *obj, void *data, QGuestAllocator *t_alloc)
.client = v9p, .fid = 0, .newfid = 1, .nwname = 1, .wnames = wnames
});
req = v9fs_tlopen(v9p, 1, O_WRONLY, 0);
req = tlopen({
.client = v9p, .fid = 1, .flags = O_WRONLY, .requestOnly = true
}).req;
v9fs_req_wait_for_reply(req, NULL);
v9fs_rlopen(req, NULL, NULL);
@ -413,7 +422,9 @@ static void fs_flush_success(void *obj, void *data, QGuestAllocator *t_alloc)
.client = v9p, .fid = 0, .newfid = 1, .nwname = 1, .wnames = wnames
});
req = v9fs_tlopen(v9p, 1, O_WRONLY, 0);
req = tlopen({
.client = v9p, .fid = 1, .flags = O_WRONLY, .requestOnly = true
}).req;
v9fs_req_wait_for_reply(req, NULL);
v9fs_rlopen(req, NULL, NULL);
@ -450,7 +461,9 @@ static void fs_flush_ignored(void *obj, void *data, QGuestAllocator *t_alloc)
.client = v9p, .fid = 0, .newfid = 1, .nwname = 1, .wnames = wnames
});
req = v9fs_tlopen(v9p, 1, O_WRONLY, 0);
req = tlopen({
.client = v9p, .fid = 1, .flags = O_WRONLY, .requestOnly = true
}).req;
v9fs_req_wait_for_reply(req, NULL);
v9fs_rlopen(req, NULL, NULL);