From: Christian Schoenebeck <qemu_oss@crudebyte.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: Greg Kurz <groug@kaod.org>
Subject: [PULL 7/7] tests/9pfs: check fid being unaffected in fs_walk_2nd_nonexistent
Date: Thu, 16 Jun 2022 13:00:04 +0200 [thread overview]
Message-ID: <0e43495d3b4a50fc5e22f7b71261fdd5b56fdfcb.1655377203.git.qemu_oss@crudebyte.com> (raw)
In-Reply-To: <cover.1655377203.git.qemu_oss@crudebyte.com>
Extend previously added test case by checking that fid was unaffected
by 'Twalk' request (i.e. when 2nd path component of request being
invalid). Do that by subsequently sending a 'Tgetattr' request with
the fid previously used for 'Twalk'; that 'Tgetattr' request should
return an 'Rlerror' response by 9p server with error code ENOENT as
that fid is basically invalid.
And as we are at it, also check that the QID returned by 'Twalk' is
not identical to the root node's QID.
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Message-Id: <6f0813cafdbf683cdac8b1492dd4ef8699c5b1d9.1647339025.git.qemu_oss@crudebyte.com>
---
tests/qtest/virtio-9p-test.c | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c
index c787ded4d2..25305a4cf7 100644
--- a/tests/qtest/virtio-9p-test.c
+++ b/tests/qtest/virtio-9p-test.c
@@ -721,14 +721,19 @@ static void fs_version(void *obj, void *data, QGuestAllocator *t_alloc)
do_version(obj);
}
-static void do_attach(QVirtio9P *v9p)
+static void do_attach_rqid(QVirtio9P *v9p, v9fs_qid *qid)
{
P9Req *req;
do_version(v9p);
req = v9fs_tattach(v9p, 0, getuid(), 0);
v9fs_req_wait_for_reply(req, NULL);
- v9fs_rattach(req, NULL);
+ v9fs_rattach(req, qid);
+}
+
+static void do_attach(QVirtio9P *v9p)
+{
+ do_attach_rqid(v9p, NULL);
}
static void fs_attach(void *obj, void *data, QGuestAllocator *t_alloc)
@@ -1101,19 +1106,32 @@ static void fs_walk_2nd_nonexistent(void *obj, void *data,
{
QVirtio9P *v9p = obj;
alloc = t_alloc;
+ v9fs_qid root_qid;
uint16_t nwqid;
+ uint32_t fid, err;
+ P9Req *req;
g_autofree v9fs_qid *wqid = NULL;
g_autofree char *path = g_strdup_printf(
QTEST_V9FS_SYNTH_WALK_FILE "/non-existent", 0
);
- do_attach(v9p);
- do_walk_rqids(v9p, path, &nwqid, &wqid);
+ do_attach_rqid(v9p, &root_qid);
+ fid = do_walk_rqids(v9p, path, &nwqid, &wqid);
/*
* The 9p2000 protocol spec says: "nwqid is therefore either nwname or the
* index of the first elementwise walk that failed."
*/
assert(nwqid == 1);
+
+ /* returned QID wqid[0] is file ID of 1st subdir */
+ g_assert(wqid && wqid[0] && !is_same_qid(root_qid, wqid[0]));
+
+ /* expect fid being unaffected by walk above */
+ req = v9fs_tgetattr(v9p, fid, P9_GETATTR_BASIC, 0);
+ v9fs_req_wait_for_reply(req, NULL);
+ v9fs_rlerror(req, &err);
+
+ g_assert_cmpint(err, ==, ENOENT);
}
static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc)
--
2.30.2
next prev parent reply other threads:[~2022-06-16 11:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-16 11:00 [PULL 0/7] 9p queue 2022-06-16 Christian Schoenebeck
2022-06-16 11:00 ` [PULL 1/7] tests/9pfs: walk to non-existent dir Christian Schoenebeck
2022-06-16 11:00 ` [PULL 4/7] 9pfs: refactor 'name_idx' -> 'nwalked' in v9fs_walk() Christian Schoenebeck
2022-06-16 11:00 ` [PULL 2/7] tests/9pfs: Twalk with nwname=0 Christian Schoenebeck
2022-06-16 11:00 ` [PULL 6/7] tests/9pfs: guard recent 'Twalk' behaviour fix Christian Schoenebeck
2022-06-16 11:00 ` Christian Schoenebeck [this message]
2022-06-16 11:00 ` [PULL 3/7] tests/9pfs: compare QIDs in fs_walk_none() test Christian Schoenebeck
2022-06-16 11:00 ` [PULL 5/7] 9pfs: fix 'Twalk' to only send error if no component walked Christian Schoenebeck via
2022-06-16 18:24 ` [PULL 0/7] 9p queue 2022-06-16 Richard Henderson
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=0e43495d3b4a50fc5e22f7b71261fdd5b56fdfcb.1655377203.git.qemu_oss@crudebyte.com \
--to=qemu_oss@crudebyte.com \
--cc=groug@kaod.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).