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 v2 5/5] 9pfs: use QArray in v9fs_walk()
Date: Sun, 22 Aug 2021 15:17:22 +0200 [thread overview]
Message-ID: <18150291edc827161bf631e1d4618ebcdf259da2.1629638507.git.qemu_oss@crudebyte.com> (raw)
In-Reply-To: <cover.1629638507.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 b59572fa79..91062ee4d6 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;
+ QArrayRef(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;
+ QArrayRef(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);
+ QARRAY_CREATE(V9fsString, wnames, nwnames);
qids = g_new0(V9fsQID, nwnames);
stbufs = g_new0(struct stat, nwnames);
- pathes = g_new0(V9fsPath, nwnames);
+ QARRAY_CREATE(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
prev parent reply other threads:[~2021-08-22 13:32 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-22 13:21 [PATCH v2 0/5] introduce QArray Christian Schoenebeck
2021-08-22 13:16 ` [PATCH v2 1/5] qemu/qarray.h: " Christian Schoenebeck
2021-08-24 8:22 ` Markus Armbruster
2021-08-24 11:51 ` Christian Schoenebeck
2021-08-24 14:45 ` Markus Armbruster
2021-08-24 15:24 ` Christian Schoenebeck
2021-08-24 15:28 ` Christian Schoenebeck
2021-08-25 8:15 ` Markus Armbruster
2021-08-24 11:58 ` Christian Schoenebeck
2021-08-24 14:21 ` Markus Armbruster
2021-09-28 13:04 ` Daniel P. Berrangé
2021-09-28 16:23 ` Christian Schoenebeck
2021-09-28 16:41 ` Daniel P. Berrangé
2021-09-29 17:32 ` Christian Schoenebeck
2021-09-29 17:48 ` Daniel P. Berrangé
2021-09-30 13:20 ` Christian Schoenebeck
2021-09-30 13:31 ` Daniel P. Berrangé
2021-09-30 13:55 ` Christian Schoenebeck
2021-09-30 14:01 ` Daniel P. Berrangé
2021-09-30 14:17 ` Christian Schoenebeck
2021-08-22 13:17 ` [PATCH v2 2/5] qemu/qarray.h: check scalar type in QARRAY_CREATE() Christian Schoenebeck
2021-08-22 13:17 ` [PATCH v2 3/5] 9pfs: make V9fsString usable via QArray API Christian Schoenebeck
2021-08-22 13:17 ` [PATCH v2 4/5] 9pfs: make V9fsPath " Christian Schoenebeck
2021-08-22 13:17 ` Christian Schoenebeck [this message]
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=18150291edc827161bf631e1d4618ebcdf259da2.1629638507.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).