ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/9p: simplify callers of tattach() 

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

Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Message-Id: <9b50e5b89a0072e84a9191d18c19a53546a28bba.1664917004.git.qemu_oss@crudebyte.com>
This commit is contained in:
Christian Schoenebeck 2022-10-04 22:53:38 +02:00
parent 74a160aba9
commit 1125ddf66f
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -302,11 +302,10 @@ static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc)
struct v9fs_attr attr; struct v9fs_attr attr;
tversion({ .client = v9p }); tversion({ .client = v9p });
req = tattach({ tattach({
.client = v9p, .fid = 0, .n_uname = getuid(), .requestOnly = true .client = v9p, .fid = 0, .n_uname = getuid(),
}).req; .rattach.qid = &root_qid
v9fs_req_wait_for_reply(req, NULL); });
v9fs_rattach(req, &root_qid);
twalk({ twalk({
.client = v9p, .fid = 0, .newfid = 1, .nwname = 0, .wnames = NULL, .client = v9p, .fid = 0, .newfid = 1, .nwname = 0, .wnames = NULL,
@ -330,14 +329,12 @@ static void fs_walk_dotdot(void *obj, void *data, QGuestAllocator *t_alloc)
char *wnames[] = { g_strdup("..") }; char *wnames[] = { g_strdup("..") };
v9fs_qid root_qid; v9fs_qid root_qid;
g_autofree v9fs_qid *wqid = NULL; g_autofree v9fs_qid *wqid = NULL;
P9Req *req;
tversion({ .client = v9p }); tversion({ .client = v9p });
req = tattach((TAttachOpt) { tattach({
.client = v9p, .fid = 0, .n_uname = getuid(), .requestOnly = true .client = v9p, .fid = 0, .n_uname = getuid(),
}).req; .rattach.qid = &root_qid
v9fs_req_wait_for_reply(req, NULL); });
v9fs_rattach(req, &root_qid);
twalk({ twalk({
.client = v9p, .fid = 0, .newfid = 1, .nwname = 1, .wnames = wnames, .client = v9p, .fid = 0, .newfid = 1, .nwname = 1, .wnames = wnames,