[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 07/16] tests/9pfs: Turn fs_readdir_split() into a helper
From: |
Christian Schoenebeck |
Subject: |
[PULL v2 07/16] tests/9pfs: Turn fs_readdir_split() into a helper |
Date: |
Tue, 20 Oct 2020 18:09:20 +0200 |
From: Greg Kurz <groug@kaod.org>
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>
Message-Id: <160321016084.266767.9501523425012383531.stgit@bahia.lan>
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
---
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 e07292bdb8..3c187cdc08 100644
--- a/tests/qtest/virtio-9p-test.c
+++ b/tests/qtest/virtio-9p-test.c
@@ -731,11 +731,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_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;
@@ -1002,19 +999,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_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_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_readdir_split(obj, 512);
}
--
2.20.1
- [PULL v2 00/16] 9p queue (previous 2020-10-23), Christian Schoenebeck, 2020/10/30
- [PULL v2 01/16] tests/9pfs: fix test dir for parallel tests, Christian Schoenebeck, 2020/10/30
- [PULL v2 02/16] tests/9pfs: fix coverity error in create_local_test_dir(), Christian Schoenebeck, 2020/10/30
- [PULL v2 03/16] tests/9pfs: Force removing of local 9pfs test directory, Christian Schoenebeck, 2020/10/30
- [PULL v2 04/16] tests/9pfs: Factor out do_version() helper, Christian Schoenebeck, 2020/10/30
- [PULL v2 05/16] tests/9pfs: Set alloc in fs_create_dir(), Christian Schoenebeck, 2020/10/30
- [PULL v2 06/16] tests/9pfs: Factor out do_attach() helper, Christian Schoenebeck, 2020/10/30
- [PULL v2 07/16] tests/9pfs: Turn fs_readdir_split() into a helper,
Christian Schoenebeck <=
- [PULL v2 08/16] tests/9pfs: Turn fs_mkdir() into a helper, Christian Schoenebeck, 2020/10/30
- [PULL v2 09/16] tests/9pfs: simplify do_mkdir(), Christian Schoenebeck, 2020/10/30
- [PULL v2 10/16] tests/9pfs: add local Tunlinkat directory test, Christian Schoenebeck, 2020/10/30
- [PULL v2 11/16] tests/9pfs: add local Tlcreate test, Christian Schoenebeck, 2020/10/30
- [PULL v2 12/16] tests/9pfs: add local Tunlinkat file test, Christian Schoenebeck, 2020/10/30
- [PULL v2 13/16] tests/9pfs: add local Tsymlink test, Christian Schoenebeck, 2020/10/30
- [PULL v2 14/16] tests/9pfs: add local Tunlinkat symlink test, Christian Schoenebeck, 2020/10/30
- [PULL v2 15/16] tests/9pfs: add local Tlink test, Christian Schoenebeck, 2020/10/30
- [PULL v2 16/16] tests/9pfs: add local Tunlinkat hard link test, Christian Schoenebeck, 2020/10/30