[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [V2 21/25] hw/9pfs: Update v9fs_mknod to use coroutines
From: |
Venkateswararao Jujjuri (JV) |
Subject: |
[Qemu-devel] [V2 21/25] hw/9pfs: Update v9fs_mknod to use coroutines |
Date: |
Tue, 17 May 2011 12:43:47 -0700 |
From: Aneesh Kumar K.V <address@hidden>
Signed-off-by: Aneesh Kumar K.V <address@hidden>
Signed-off-by: Venkateswararao Jujjuri "<address@hidden>
---
hw/9pfs/virtio-9p.c | 88 +++++++++++++++++---------------------------------
1 files changed, 30 insertions(+), 58 deletions(-)
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 46577c0..3f4d449 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -3017,77 +3017,49 @@ out:
return;
}
-static void v9fs_mknod_post_lstat(V9fsState *s, V9fsMkState *vs, int err)
-{
- if (err == -1) {
- err = -errno;
- goto out;
- }
-
- stat_to_qid(&vs->stbuf, &vs->qid);
- vs->offset += pdu_marshal(vs->pdu, vs->offset, "Q", &vs->qid);
- err = vs->offset;
-out:
- complete_pdu(s, vs->pdu, err);
- v9fs_string_free(&vs->fullname);
- v9fs_string_free(&vs->name);
- qemu_free(vs);
-}
-
-static void v9fs_mknod_post_mknod(V9fsState *s, V9fsMkState *vs, int err)
-{
- if (err == -1) {
- err = -errno;
- goto out;
- }
-
- err = v9fs_do_lstat(s, &vs->fullname, &vs->stbuf);
- v9fs_mknod_post_lstat(s, vs, err);
- return;
-out:
- complete_pdu(s, vs->pdu, err);
- v9fs_string_free(&vs->fullname);
- v9fs_string_free(&vs->name);
- qemu_free(vs);
-}
-
static void v9fs_mknod(void *opaque)
{
- V9fsPDU *pdu = opaque;
- V9fsState *s = pdu->s;
+
+ int mode;
+ gid_t gid;
int32_t fid;
- V9fsMkState *vs;
+ V9fsQID qid;
int err = 0;
- V9fsFidState *fidp;
- gid_t gid;
- int mode;
int major, minor;
+ size_t offset = 7;
+ V9fsString name;
+ struct stat stbuf;
+ V9fsString fullname;
+ V9fsFidState *fidp;
+ V9fsPDU *pdu = opaque;
+ V9fsState *s = pdu->s;
- vs = qemu_malloc(sizeof(*vs));
- vs->pdu = pdu;
- vs->offset = 7;
-
- v9fs_string_init(&vs->fullname);
- pdu_unmarshal(vs->pdu, vs->offset, "dsdddd", &fid, &vs->name, &mode,
- &major, &minor, &gid);
+ v9fs_string_init(&fullname);
+ pdu_unmarshal(pdu, offset, "dsdddd", &fid, &name, &mode,
+ &major, &minor, &gid);
fidp = lookup_fid(s, fid);
if (fidp == NULL) {
err = -ENOENT;
goto out;
}
-
- v9fs_string_sprintf(&vs->fullname, "%s/%s", fidp->path.data,
vs->name.data);
- err = v9fs_do_mknod(s, vs->fullname.data, mode, makedev(major, minor),
- fidp->uid, gid);
- v9fs_mknod_post_mknod(s, vs, err);
- return;
-
+ v9fs_string_sprintf(&fullname, "%s/%s", fidp->path.data, name.data);
+ err = v9fs_co_mknod(s, &fullname, fidp->uid, gid,
+ makedev(major, minor), mode);
+ if (err < 0) {
+ goto out;
+ }
+ err = v9fs_co_lstat(s, &fullname, &stbuf);
+ if (err < 0) {
+ goto out;
+ }
+ stat_to_qid(&stbuf, &qid);
+ err = offset;
+ err += pdu_marshal(pdu, offset, "Q", &qid);
out:
- complete_pdu(s, vs->pdu, err);
- v9fs_string_free(&vs->fullname);
- v9fs_string_free(&vs->name);
- qemu_free(vs);
+ complete_pdu(s, pdu, err);
+ v9fs_string_free(&fullname);
+ v9fs_string_free(&name);
}
/*
--
1.7.1
- [Qemu-devel] [V2 19/25] hw/9pfs: Update v9fs_xattrcreate to use coroutines, (continued)
[Qemu-devel] [V2 02/25] [virtio-9p] Change all pdu handlers to coroutines., Venkateswararao Jujjuri (JV), 2011/05/17
[Qemu-devel] [V2 17/25] hw/9pfs: Add yield support to xattr related coroutine, Venkateswararao Jujjuri (JV), 2011/05/17
[Qemu-devel] [V2 22/25] [virtio-9p] coroutine and threading for mkdir, Venkateswararao Jujjuri (JV), 2011/05/17
[Qemu-devel] [V2 21/25] hw/9pfs: Update v9fs_mknod to use coroutines,
Venkateswararao Jujjuri (JV) <=
[Qemu-devel] [V2 04/25] [virtio-9p] clean up v9fs_readlink., Venkateswararao Jujjuri (JV), 2011/05/17
[Qemu-devel] [V2 23/25] [virtio-9p] Remove post functions for v9fs_remove, Venkateswararao Jujjuri (JV), 2011/05/17
[Qemu-devel] [V2 20/25] hw/9pfs: Add yield support to mknod coroutine, Venkateswararao Jujjuri (JV), 2011/05/17
[Qemu-devel] [V2 01/25] [virtio-9p] Add infrastructure to support glib threads and coroutines., Venkateswararao Jujjuri (JV), 2011/05/17
[Qemu-devel] [V2 25/25] [virtio-9p] coroutine and threading for remove/unlink, Venkateswararao Jujjuri (JV), 2011/05/17
[Qemu-devel] [V2 24/25] [virtio-9p] clean up v9fs_remove., Venkateswararao Jujjuri (JV), 2011/05/17
Re: [Qemu-devel] [V2 0/25] Async threading for VirtFS using glib threads & coroutines., Stefan Hajnoczi, 2011/05/18