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

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

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

Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Message-Id: <d340a91be96fbfecfb8dacdd7558223b3c0d0e2c.1664917004.git.qemu_oss@crudebyte.com>
This commit is contained in:
Christian Schoenebeck 2022-10-04 22:53:41 +02:00
parent 1125ddf66f
commit 2af5be47b9
3 changed files with 63 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -489,16 +489,36 @@ void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid)
}
/* size[4] Tgetattr tag[2] fid[4] request_mask[8] */
P9Req *v9fs_tgetattr(QVirtio9P *v9p, uint32_t fid, uint64_t request_mask,
uint16_t tag)
TGetAttrRes v9fs_tgetattr(TGetAttrOpt opt)
{
P9Req *req;
uint32_t err;
req = v9fs_req_init(v9p, 4 + 8, P9_TGETATTR, tag);
v9fs_uint32_write(req, fid);
v9fs_uint64_write(req, request_mask);
g_assert(opt.client);
/* expecting either Rgetattr or Rlerror, but obviously not both */
g_assert(!opt.expectErr || !opt.rgetattr.attr);
if (!opt.request_mask) {
opt.request_mask = P9_GETATTR_ALL;
}
req = v9fs_req_init(opt.client, 4 + 8, P9_TGETATTR, opt.tag);
v9fs_uint32_write(req, opt.fid);
v9fs_uint64_write(req, opt.request_mask);
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_rgetattr(req, opt.rgetattr.attr);
}
req = NULL; /* request was freed */
}
return (TGetAttrRes) { .req = req };
}
/*

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

@ -63,6 +63,7 @@ typedef struct v9fs_attr {
} v9fs_attr;
#define P9_GETATTR_BASIC 0x000007ffULL /* Mask for fields up to BLOCKS */
#define P9_GETATTR_ALL 0x00003fffULL /* Mask for ALL fields */
struct V9fsDirent {
v9fs_qid qid;
@ -155,6 +156,32 @@ typedef struct TAttachRes {
P9Req *req;
} TAttachRes;
/* options for 'Tgetattr' 9p request */
typedef struct TGetAttrOpt {
/* 9P client being used (mandatory) */
QVirtio9P *client;
/* user supplied tag number being returned with response (optional) */
uint16_t tag;
/* file ID of file/dir whose attributes shall be retrieved (required) */
uint32_t fid;
/* bitmask indicating attribute fields to be retrieved (optional) */
uint64_t request_mask;
/* data being received from 9p server as 'Rgetattr' response (optional) */
struct {
v9fs_attr *attr;
} rgetattr;
/* only send Tgetattr 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;
} TGetAttrOpt;
/* result of 'Tgetattr' 9p request */
typedef struct TGetAttrRes {
/* if requestOnly was set: request object for further processing */
P9Req *req;
} TGetAttrRes;
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);
@ -182,8 +209,7 @@ TAttachRes v9fs_tattach(TAttachOpt);
void v9fs_rattach(P9Req *req, v9fs_qid *qid);
TWalkRes v9fs_twalk(TWalkOpt opt);
void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid);
P9Req *v9fs_tgetattr(QVirtio9P *v9p, uint32_t fid, uint64_t request_mask,
uint16_t tag);
TGetAttrRes v9fs_tgetattr(TGetAttrOpt);
void v9fs_rgetattr(P9Req *req, v9fs_attr *attr);
P9Req *v9fs_treaddir(QVirtio9P *v9p, uint32_t fid, uint64_t offset,
uint32_t count, uint16_t tag);

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

@ -19,6 +19,7 @@
#define twalk(...) v9fs_twalk((TWalkOpt) __VA_ARGS__)
#define tversion(...) v9fs_tversion((TVersionOpt) __VA_ARGS__)
#define tattach(...) v9fs_tattach((TAttachOpt) __VA_ARGS__)
#define tgetattr(...) v9fs_tgetattr((TGetAttrOpt) __VA_ARGS__)
static void pci_config(void *obj, void *data, QGuestAllocator *t_alloc)
{
@ -285,7 +286,10 @@ static void fs_walk_2nd_nonexistent(void *obj, void *data,
g_assert(wqid && wqid[0] && !is_same_qid(root_qid, wqid[0]));
/* expect fid being unaffected by walk above */
req = v9fs_tgetattr(v9p, fid, P9_GETATTR_BASIC, 0);
req = tgetattr({
.client = v9p, .fid = fid, .request_mask = P9_GETATTR_BASIC,
.requestOnly = true
}).req;
v9fs_req_wait_for_reply(req, NULL);
v9fs_rlerror(req, &err);
@ -315,7 +319,10 @@ static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc)
/* special case: no QID is returned if nwname=0 was sent */
g_assert(wqid == NULL);
req = v9fs_tgetattr(v9p, 1, P9_GETATTR_BASIC, 0);
req = tgetattr({
.client = v9p, .fid = 1, .request_mask = P9_GETATTR_BASIC,
.requestOnly = true
}).req;
v9fs_req_wait_for_reply(req, NULL);
v9fs_rgetattr(req, &attr);