[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/25] hw/9pfs: Update v9fs_getattr to use coroutine
From: |
Venkateswararao Jujjuri (JV) |
Subject: |
[Qemu-devel] [PATCH 14/25] hw/9pfs: Update v9fs_getattr to use coroutines |
Date: |
Thu, 12 May 2011 13:57:36 -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 | 59 +++++++++++++++++---------------------------------
hw/9pfs/virtio-9p.h | 8 -------
2 files changed, 20 insertions(+), 47 deletions(-)
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 86e9482..fa2bb1f 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -1088,7 +1088,7 @@ static int stat_to_v9stat(V9fsState *s, V9fsString *name,
static void stat_to_v9stat_dotl(V9fsState *s, const struct stat *stbuf,
- V9fsStatDotl *v9lstat)
+ V9fsStatDotl *v9lstat)
{
memset(v9lstat, 0, sizeof(*v9lstat));
@@ -1291,58 +1291,39 @@ out:
qemu_free(copdu);
}
-static void v9fs_getattr_post_lstat(V9fsState *s, V9fsStatStateDotl *vs,
- int err)
-{
- if (err == -1) {
- err = -errno;
- goto out;
- }
-
- stat_to_v9stat_dotl(s, &vs->stbuf, &vs->v9stat_dotl);
- vs->offset += pdu_marshal(vs->pdu, vs->offset, "A", &vs->v9stat_dotl);
- err = vs->offset;
-
-out:
- complete_pdu(s, vs->pdu, err);
- qemu_free(vs);
-}
-
static void v9fs_getattr(void *opaque)
{
- V9fsCoPdu *copdu = opaque;
- V9fsState *s = copdu->s;
- V9fsPDU *pdu = copdu->pdu;
int32_t fid;
- V9fsStatStateDotl *vs;
- ssize_t err = 0;
+ size_t offset = 7;
+ ssize_t retval = 0;
+ struct stat stbuf;
V9fsFidState *fidp;
uint64_t request_mask;
+ V9fsStatDotl v9stat_dotl;
+ V9fsCoPdu *copdu = opaque;
+ V9fsState *s = copdu->s;
+ V9fsPDU *pdu = copdu->pdu;
- vs = qemu_malloc(sizeof(*vs));
- vs->pdu = pdu;
- vs->offset = 7;
-
- memset(&vs->v9stat_dotl, 0, sizeof(vs->v9stat_dotl));
-
- pdu_unmarshal(vs->pdu, vs->offset, "dq", &fid, &request_mask);
+ pdu_unmarshal(pdu, offset, "dq", &fid, &request_mask);
fidp = lookup_fid(s, fid);
if (fidp == NULL) {
- err = -ENOENT;
+ retval = -ENOENT;
goto out;
}
-
- /* Currently we only support BASIC fields in stat, so there is no
+ /*
+ * Currently we only support BASIC fields in stat, so there is no
* need to look at request_mask.
*/
- err = v9fs_do_lstat(s, &fidp->path, &vs->stbuf);
- v9fs_getattr_post_lstat(s, vs, err);
- return;
-
+ retval = v9fs_co_lstat(s, &fidp->path, &stbuf);
+ if (retval < 0) {
+ goto out;
+ }
+ stat_to_v9stat_dotl(s, &stbuf, &v9stat_dotl);
+ retval = offset;
+ retval += pdu_marshal(pdu, offset, "A", &v9stat_dotl);
out:
- complete_pdu(s, vs->pdu, err);
- qemu_free(vs);
+ complete_pdu(s, pdu, retval);
qemu_free(copdu);
}
diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
index ee8cb79..7e4bea0 100644
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -276,14 +276,6 @@ typedef struct V9fsStatDotl {
uint64_t st_data_version;
} V9fsStatDotl;
-typedef struct V9fsStatStateDotl {
- V9fsPDU *pdu;
- size_t offset;
- V9fsStatDotl v9stat_dotl;
- struct stat stbuf;
-} V9fsStatStateDotl;
-
-
typedef struct V9fsWalkState {
V9fsPDU *pdu;
size_t offset;
--
1.7.1
- [Qemu-devel] [0/25] Async threading for VirtFS using glib threads & coroutines., Venkateswararao Jujjuri (JV), 2011/05/12
- [Qemu-devel] [PATCH 05/25] [virtio-9p] Move errno into v9fs_do_readlink, Venkateswararao Jujjuri (JV), 2011/05/12
- [Qemu-devel] [PATCH 03/25] [virtio-9p] Remove post functions for v9fs_readlink., Venkateswararao Jujjuri (JV), 2011/05/12
- [Qemu-devel] [PATCH 04/25] [virtio-9p] clean up v9fs_readlink., Venkateswararao Jujjuri (JV), 2011/05/12
- [Qemu-devel] [PATCH 02/25] [virtio-9p] Change all pdu handlers to coroutines., Venkateswararao Jujjuri (JV), 2011/05/12
- [Qemu-devel] [PATCH 06/25] [virtio-9p] coroutines for readlink, Venkateswararao Jujjuri (JV), 2011/05/12
- [Qemu-devel] [PATCH 07/25] [virtio-9p] Remove post functions for v9fs_mkdir., Venkateswararao Jujjuri (JV), 2011/05/12
- [Qemu-devel] [PATCH 14/25] hw/9pfs: Update v9fs_getattr to use coroutines,
Venkateswararao Jujjuri (JV) <=
- [Qemu-devel] [PATCH 12/25] hw/9pfs: Update v9fs_statfs to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/12
- [Qemu-devel] [PATCH 01/25] [virtio-9p] Add infrastructure to support glib threads and coroutines., Venkateswararao Jujjuri (JV), 2011/05/12
- [Qemu-devel] [PATCH 13/25] hw/9pfs: Add yield support to lstat coroutine, Venkateswararao Jujjuri (JV), 2011/05/12
- [Qemu-devel] [PATCH 16/25] hw/9pfs: Update v9fs_setattr to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/12
- [Qemu-devel] [PATCH 10/25] hw/9pfs: Update v9fs_readdir to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/12
- [Qemu-devel] [PATCH 18/25] hw/9pfs: Update v9fs_xattrwalk to coroutines, Venkateswararao Jujjuri (JV), 2011/05/12
- [Qemu-devel] [PATCH 09/25] hw/9pfs: Add yield support for readdir related coroutines, Venkateswararao Jujjuri (JV), 2011/05/12