[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/5] tests/9pfs: Factor out do_fs_version() helper
From: |
Greg Kurz |
Subject: |
[PATCH 1/5] tests/9pfs: Factor out do_fs_version() helper |
Date: |
Tue, 20 Oct 2020 17:11:05 +0200 |
User-agent: |
StGit/0.21 |
fs_version() is a top level test function. Factor out the sugar
to a separate helper instead of hijacking it in other tests.
Signed-off-by: Greg Kurz <groug@kaod.org>
---
tests/qtest/virtio-9p-test.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c
index c15908f27b3d..63f91aaf77e6 100644
--- a/tests/qtest/virtio-9p-test.c
+++ b/tests/qtest/virtio-9p-test.c
@@ -567,10 +567,8 @@ static void v9fs_rflush(P9Req *req)
v9fs_req_free(req);
}
-static void fs_version(void *obj, void *data, QGuestAllocator *t_alloc)
+static void do_fs_version(QVirtio9P *v9p)
{
- QVirtio9P *v9p = obj;
- alloc = t_alloc;
const char *version = "9P2000.L";
uint16_t server_len;
char *server_version;
@@ -585,13 +583,19 @@ static void fs_version(void *obj, void *data,
QGuestAllocator *t_alloc)
g_free(server_version);
}
+static void fs_version(void *obj, void *data, QGuestAllocator *t_alloc)
+{
+ alloc = t_alloc;
+ do_fs_version(obj);
+}
+
static void fs_attach(void *obj, void *data, QGuestAllocator *t_alloc)
{
QVirtio9P *v9p = obj;
alloc = t_alloc;
P9Req *req;
- fs_version(v9p, NULL, t_alloc);
+ do_fs_version(v9p);
req = v9fs_tattach(v9p, 0, getuid(), 0);
v9fs_req_wait_for_reply(req, NULL);
v9fs_rattach(req, NULL);
@@ -831,7 +835,7 @@ static void fs_walk_dotdot(void *obj, void *data,
QGuestAllocator *t_alloc)
v9fs_qid root_qid, *wqid;
P9Req *req;
- fs_version(v9p, NULL, t_alloc);
+ do_fs_version(v9p);
req = v9fs_tattach(v9p, 0, getuid(), 0);
v9fs_req_wait_for_reply(req, NULL);
v9fs_rattach(req, &root_qid);
- [PATCH 0/5] tests/9pfs: Code refactoring, Greg Kurz, 2020/10/20
- [PATCH 1/5] tests/9pfs: Factor out do_fs_version() helper,
Greg Kurz <=
- [PATCH 2/5] tests/9pfs: Turn fs_readdir_split() into a helper, Greg Kurz, 2020/10/20
- [PATCH 3/5] tests/9pfs: Set alloc in fs_create_dir(), Greg Kurz, 2020/10/20
- [PATCH 4/5] tests/9pfs: Factor out do_fs_attach() helper, Greg Kurz, 2020/10/20
- [PATCH 5/5] tests/9pfs: Turn fs_mkdir() into a helper, Greg Kurz, 2020/10/20