From: Christian Schoenebeck <qemu_oss@crudebyte.com>
To: qemu-devel@nongnu.org
Cc: Greg Kurz <groug@kaod.org>,
Richard Henderson <richard.henderson@linaro.org>
Subject: [PATCH 5/5] 9pfs: use P9Array in v9fs_walk()
Date: Fri, 1 Oct 2021 16:27:59 +0200 [thread overview]
Message-ID: <90c65d1c1ca11c1b434bb981b1fc7966f7711c8f.1633097129.git.qemu_oss@crudebyte.com> (raw)
In-Reply-To: <cover.1633097129.git.qemu_oss@crudebyte.com>
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
---
hw/9pfs/9p.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index e432c4c007..27c4b8ba78 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -1707,13 +1707,14 @@ static void coroutine_fn v9fs_walk(void *opaque)
int name_idx;
g_autofree V9fsQID *qids = NULL;
int i, err = 0;
- V9fsPath dpath, path, *pathes = NULL;
+ V9fsPath dpath, path;
+ P9ARRAY_REF(V9fsPath) pathes = NULL;
uint16_t nwnames;
struct stat stbuf, fidst;
g_autofree struct stat *stbufs = NULL;
size_t offset = 7;
int32_t fid, newfid;
- V9fsString *wnames = NULL;
+ P9ARRAY_REF(V9fsString) wnames = NULL;
V9fsFidState *fidp;
V9fsFidState *newfidp = NULL;
V9fsPDU *pdu = opaque;
@@ -1734,10 +1735,10 @@ static void coroutine_fn v9fs_walk(void *opaque)
goto out_nofid;
}
if (nwnames) {
- wnames = g_new0(V9fsString, nwnames);
+ P9ARRAY_NEW(V9fsString, wnames, nwnames);
qids = g_new0(V9fsQID, nwnames);
stbufs = g_new0(struct stat, nwnames);
- pathes = g_new0(V9fsPath, nwnames);
+ P9ARRAY_NEW(V9fsPath, pathes, nwnames);
for (i = 0; i < nwnames; i++) {
err = pdu_unmarshal(pdu, offset, "s", &wnames[i]);
if (err < 0) {
@@ -1869,14 +1870,6 @@ out:
v9fs_path_free(&path);
out_nofid:
pdu_complete(pdu, err);
- if (nwnames && nwnames <= P9_MAXWELEM) {
- for (name_idx = 0; name_idx < nwnames; name_idx++) {
- v9fs_string_free(&wnames[name_idx]);
- v9fs_path_free(&pathes[name_idx]);
- }
- g_free(wnames);
- g_free(pathes);
- }
}
static int32_t coroutine_fn get_iounit(V9fsPDU *pdu, V9fsPath *path)
--
2.20.1
next prev parent reply other threads:[~2021-10-01 14:38 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-01 14:25 [PATCH 0/5] 9pfs: introduce P9Array Christian Schoenebeck
2021-10-01 14:26 ` [PATCH 1/5] " Christian Schoenebeck
2021-10-01 15:16 ` Daniel P. Berrangé
2021-10-01 15:27 ` Christian Schoenebeck
2021-10-01 14:27 ` [PATCH 2/5] fsdev/p9array.h: check scalar type in P9ARRAY_NEW() Christian Schoenebeck
2021-10-01 14:27 ` [PATCH 3/5] 9pfs: make V9fsString usable via P9Array API Christian Schoenebeck
2021-10-01 14:27 ` [PATCH 4/5] 9pfs: make V9fsPath " Christian Schoenebeck
2021-10-01 14:27 ` Christian Schoenebeck [this message]
2021-10-14 13:25 ` [PATCH 0/5] 9pfs: introduce P9Array Christian Schoenebeck
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=90c65d1c1ca11c1b434bb981b1fc7966f7711c8f.1633097129.git.qemu_oss@crudebyte.com \
--to=qemu_oss@crudebyte.com \
--cc=groug@kaod.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).