[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/5] tests/9pfs: Turn fs_readdir_split() into a helper
From: |
Greg Kurz |
Subject: |
[PATCH 2/5] tests/9pfs: Turn fs_readdir_split() into a helper |
Date: |
Tue, 20 Oct 2020 17:11:12 +0200 |
User-agent: |
StGit/0.21 |
fs_readdir_split() isn't a top level test function and thus shouldn't
take the "void *obj, void *data, QGuestAllocator *t_alloc" arguments.
Turn it into a helper to be used by test functions.
Signed-off-by: Greg Kurz <groug@kaod.org>
---
tests/qtest/virtio-9p-test.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c
index 63f91aaf77e6..d0cdc14fee3e 100644
--- a/tests/qtest/virtio-9p-test.c
+++ b/tests/qtest/virtio-9p-test.c
@@ -727,11 +727,8 @@ static void fs_readdir(void *obj, void *data,
QGuestAllocator *t_alloc)
}
/* readdir test where overall request is split over several messages */
-static void fs_readdir_split(void *obj, void *data, QGuestAllocator *t_alloc,
- uint32_t count)
+static void do_fs_readdir_split(QVirtio9P *v9p, uint32_t count)
{
- QVirtio9P *v9p = obj;
- alloc = t_alloc;
char *const wnames[] = { g_strdup(QTEST_V9FS_SYNTH_READDIR_DIR) };
uint16_t nqid;
v9fs_qid qid;
@@ -998,19 +995,22 @@ static void fs_mkdir(void *obj, void *data,
QGuestAllocator *t_alloc,
static void fs_readdir_split_128(void *obj, void *data,
QGuestAllocator *t_alloc)
{
- fs_readdir_split(obj, data, t_alloc, 128);
+ alloc = t_alloc;
+ do_fs_readdir_split(obj, 128);
}
static void fs_readdir_split_256(void *obj, void *data,
QGuestAllocator *t_alloc)
{
- fs_readdir_split(obj, data, t_alloc, 256);
+ alloc = t_alloc;
+ do_fs_readdir_split(obj, 256);
}
static void fs_readdir_split_512(void *obj, void *data,
QGuestAllocator *t_alloc)
{
- fs_readdir_split(obj, data, t_alloc, 512);
+ alloc = t_alloc;
+ do_fs_readdir_split(obj, 512);
}