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

tests/9p: simplify callers of treaddir()

Browse Source 
Now as treaddir() is using a declarative approach, simplify the
code of callers of this function.

Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Message-Id: <7cec6f2c7011a481806c34908893b7282702a7a6.1664917004.git.qemu_oss@crudebyte.com>
This commit is contained in:
Christian Schoenebeck 2022-10-04 22:53:49 +02:00
parent 1ebacc40ca
commit a9a5376931
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,12 +120,12 @@ static void fs_readdir(void *obj, void *data, QGuestAllocator *t_alloc)
/*
* submit count = msize - 11, because 11 is the header size of Rreaddir
*/
req = treaddir({
treaddir({
.client = v9p, .fid = 1, .offset = 0, .count = P9_MAX_SIZE - 11,
.requestOnly = true
}).req;
v9fs_req_wait_for_reply(req, NULL);
v9fs_rreaddir(req, &count, &nentries, &entries);
.rreaddir = {
.count = &count, .nentries = &nentries, .entries = &entries
}
});
/*
* Assuming msize (P9_MAX_SIZE) is large enough so we can retrieve all
@ -190,12 +190,13 @@ static void do_readdir_split(QVirtio9P *v9p, uint32_t count)
npartialentries = 0;
partialentries = NULL;
req = treaddir({
treaddir({
.client = v9p, .fid = fid, .offset = offset, .count = count,
.requestOnly = true
}).req;
v9fs_req_wait_for_reply(req, NULL);
v9fs_rreaddir(req, &count, &npartialentries, &partialentries);
.rreaddir = {
.count = &count, .nentries = &npartialentries,
.entries = &partialentries
}
});
if (npartialentries > 0 && partialentries) {
if (!entries) {
entries = partialentries;