vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Use declarative function arguments for function v9fs_tflush().

Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Message-Id: <91b7b154298c500d100b05137146c2905c3acdec.1664917004.git.qemu_oss@crudebyte.com>
master
Christian Schoenebeck 2022-10-04 22:54:03 +02:00
parent bb286ff8e8
commit d89146fd16
3 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -733,14 +733,29 @@ void v9fs_rwrite(P9Req *req, uint32_t *count)
}
/* size[4] Tflush tag[2] oldtag[2] */
P9Req *v9fs_tflush(QVirtio9P *v9p, uint16_t oldtag, uint16_t tag)
TFlushRes v9fs_tflush(TFlushOpt opt)
{
P9Req *req;
uint32_t err;
req = v9fs_req_init(v9p, 2, P9_TFLUSH, tag);
v9fs_uint32_write(req, oldtag);
g_assert(opt.client);
req = v9fs_req_init(opt.client, 2, P9_TFLUSH, opt.tag);
v9fs_uint32_write(req, opt.oldtag);
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_rflush(req);
}
req = NULL; /* request was freed */
}
return (TFlushRes) { .req = req };
}
/* size[4] Rflush tag[2] */

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

@ -267,6 +267,26 @@ typedef struct TWriteRes {
uint32_t count;
} TWriteRes;
/* options for 'Tflush' 9p request */
typedef struct TFlushOpt {
/* 9P client being used (mandatory) */
QVirtio9P *client;
/* user supplied tag number being returned with response (optional) */
uint16_t tag;
/* message to flush (required) */
uint16_t oldtag;
/* only send Tflush 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;
} TFlushOpt;
/* result of 'Tflush' 9p request */
typedef struct TFlushRes {
/* if requestOnly was set: request object for further processing */
P9Req *req;
} TFlushRes;
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);
@ -304,7 +324,7 @@ TLOpenRes v9fs_tlopen(TLOpenOpt);
void v9fs_rlopen(P9Req *req, v9fs_qid *qid, uint32_t *iounit);
TWriteRes v9fs_twrite(TWriteOpt);
void v9fs_rwrite(P9Req *req, uint32_t *count);
P9Req *v9fs_tflush(QVirtio9P *v9p, uint16_t oldtag, uint16_t tag);
TFlushRes v9fs_tflush(TFlushOpt);
void v9fs_rflush(P9Req *req);
P9Req *v9fs_tmkdir(QVirtio9P *v9p, uint32_t dfid, const char *name,
uint32_t mode, uint32_t gid, uint16_t tag);

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

@ -23,6 +23,7 @@
#define treaddir(...) v9fs_treaddir((TReadDirOpt) __VA_ARGS__)
#define tlopen(...) v9fs_tlopen((TLOpenOpt) __VA_ARGS__)
#define twrite(...) v9fs_twrite((TWriteOpt) __VA_ARGS__)
#define tflush(...) v9fs_tflush((TFlushOpt) __VA_ARGS__)
static void pci_config(void *obj, void *data, QGuestAllocator *t_alloc)
{
@ -420,7 +421,9 @@ static void fs_flush_success(void *obj, void *data, QGuestAllocator *t_alloc)
.requestOnly = true
}).req;
flush_req = v9fs_tflush(v9p, req->tag, 1);
flush_req = tflush({
.client = v9p, .oldtag = req->tag, .tag = 1, .requestOnly = true
}).req;
/* The write request is supposed to be flushed: the server should just
* mark the write request as used and reply to the flush request.
@ -459,7 +462,9 @@ static void fs_flush_ignored(void *obj, void *data, QGuestAllocator *t_alloc)
.requestOnly = true
}).req;
flush_req = v9fs_tflush(v9p, req->tag, 1);
flush_req = tflush({
.client = v9p, .oldtag = req->tag, .tag = 1, .requestOnly = true
}).req;
/* The write request is supposed to complete. The server should
* reply to the write request and the flush request.