From: Greg Kurz <groug@kaod.org>
To: Christian Schoenebeck <qemu_oss@crudebyte.com>
Cc: qemu-devel@nongnu.org, Greg Kurz <groug@kaod.org>
Subject: [PATCH 4/5] tests/9pfs: Factor out do_fs_attach() helper
Date: Tue, 20 Oct 2020 17:11:26 +0200 [thread overview]
Message-ID: <160320668629.255209.17942580749099373236.stgit@bahia.lan> (raw)
In-Reply-To: <160320655763.255209.3890094487013964615.stgit@bahia.lan>
fs_attach() 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 | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c
index 95638662e14d..1e1b1433014b 100644
--- a/tests/qtest/virtio-9p-test.c
+++ b/tests/qtest/virtio-9p-test.c
@@ -589,10 +589,8 @@ static void fs_version(void *obj, void *data, QGuestAllocator *t_alloc)
do_fs_version(obj);
}
-static void fs_attach(void *obj, void *data, QGuestAllocator *t_alloc)
+static void do_fs_attach(QVirtio9P *v9p)
{
- QVirtio9P *v9p = obj;
- alloc = t_alloc;
P9Req *req;
do_fs_version(v9p);
@@ -601,6 +599,12 @@ static void fs_attach(void *obj, void *data, QGuestAllocator *t_alloc)
v9fs_rattach(req, NULL);
}
+static void fs_attach(void *obj, void *data, QGuestAllocator *t_alloc)
+{
+ alloc = t_alloc;
+ do_fs_attach(obj);
+}
+
static void fs_walk(void *obj, void *data, QGuestAllocator *t_alloc)
{
QVirtio9P *v9p = obj;
@@ -615,7 +619,7 @@ static void fs_walk(void *obj, void *data, QGuestAllocator *t_alloc)
wnames[i] = g_strdup_printf(QTEST_V9FS_SYNTH_WALK_FILE, i);
}
- fs_attach(v9p, NULL, t_alloc);
+ do_fs_attach(v9p);
req = v9fs_twalk(v9p, 0, 1, P9_MAXWELEM, wnames, 0);
v9fs_req_wait_for_reply(req, NULL);
v9fs_rwalk(req, &nwqid, &wqid);
@@ -684,7 +688,7 @@ static void fs_readdir(void *obj, void *data, QGuestAllocator *t_alloc)
struct V9fsDirent *entries = NULL;
P9Req *req;
- fs_attach(v9p, NULL, t_alloc);
+ do_fs_attach(v9p);
req = v9fs_twalk(v9p, 0, 1, 1, wnames, 0);
v9fs_req_wait_for_reply(req, NULL);
v9fs_rwalk(req, &nqid, NULL);
@@ -738,7 +742,7 @@ static void do_fs_readdir_split(QVirtio9P *v9p, uint32_t count)
int fid;
uint64_t offset;
- fs_attach(v9p, NULL, t_alloc);
+ do_fs_attach(v9p);
fid = 1;
offset = 0;
@@ -814,7 +818,7 @@ static void fs_walk_no_slash(void *obj, void *data, QGuestAllocator *t_alloc)
P9Req *req;
uint32_t err;
- fs_attach(v9p, NULL, t_alloc);
+ do_fs_attach(v9p);
req = v9fs_twalk(v9p, 0, 1, 1, wnames, 0);
v9fs_req_wait_for_reply(req, NULL);
v9fs_rlerror(req, &err);
@@ -854,7 +858,7 @@ static void fs_lopen(void *obj, void *data, QGuestAllocator *t_alloc)
char *const wnames[] = { g_strdup(QTEST_V9FS_SYNTH_LOPEN_FILE) };
P9Req *req;
- fs_attach(v9p, NULL, t_alloc);
+ do_fs_attach(v9p);
req = v9fs_twalk(v9p, 0, 1, 1, wnames, 0);
v9fs_req_wait_for_reply(req, NULL);
v9fs_rwalk(req, NULL, NULL);
@@ -876,7 +880,7 @@ static void fs_write(void *obj, void *data, QGuestAllocator *t_alloc)
uint32_t count;
P9Req *req;
- fs_attach(v9p, NULL, t_alloc);
+ do_fs_attach(v9p);
req = v9fs_twalk(v9p, 0, 1, 1, wnames, 0);
v9fs_req_wait_for_reply(req, NULL);
v9fs_rwalk(req, NULL, NULL);
@@ -903,7 +907,7 @@ static void fs_flush_success(void *obj, void *data, QGuestAllocator *t_alloc)
uint32_t reply_len;
uint8_t should_block;
- fs_attach(v9p, NULL, t_alloc);
+ do_fs_attach(v9p);
req = v9fs_twalk(v9p, 0, 1, 1, wnames, 0);
v9fs_req_wait_for_reply(req, NULL);
v9fs_rwalk(req, NULL, NULL);
@@ -940,7 +944,7 @@ static void fs_flush_ignored(void *obj, void *data, QGuestAllocator *t_alloc)
uint32_t count;
uint8_t should_block;
- fs_attach(v9p, NULL, t_alloc);
+ do_fs_attach(v9p);
req = v9fs_twalk(v9p, 0, 1, 1, wnames, 0);
v9fs_req_wait_for_reply(req, NULL);
v9fs_rwalk(req, NULL, NULL);
@@ -1026,7 +1030,7 @@ static void fs_create_dir(void *obj, void *data, QGuestAllocator *t_alloc)
g_assert(root_path != NULL);
- fs_attach(v9p, NULL, t_alloc);
+ do_fs_attach(v9p);
fs_mkdir(v9p, data, t_alloc, "/", "01");
/* check if created directory really exists now ... */
next prev parent reply other threads:[~2020-10-20 15:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-20 15:10 [PATCH 0/5] tests/9pfs: Code refactoring Greg Kurz
2020-10-20 15:11 ` [PATCH 1/5] tests/9pfs: Factor out do_fs_version() helper Greg Kurz
2020-10-20 15:34 ` Christian Schoenebeck
2020-10-20 15:41 ` Greg Kurz
2020-10-20 15:50 ` Christian Schoenebeck
2020-10-20 15:11 ` [PATCH 2/5] tests/9pfs: Turn fs_readdir_split() into a helper Greg Kurz
2020-10-20 15:11 ` [PATCH 3/5] tests/9pfs: Set alloc in fs_create_dir() Greg Kurz
2020-10-20 15:11 ` Greg Kurz [this message]
2020-10-20 15:11 ` [PATCH 5/5] tests/9pfs: Turn fs_mkdir() into a helper Greg Kurz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=160320668629.255209.17942580749099373236.stgit@bahia.lan \
--to=groug@kaod.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu_oss@crudebyte.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).