[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH -V4 14/26] hw/9pfs: Update v9fs_getattr to use corou
From: |
Aneesh Kumar K.V |
Subject: |
[Qemu-devel] [PATCH -V4 14/26] hw/9pfs: Update v9fs_getattr to use coroutines |
Date: |
Mon, 8 Aug 2011 22:34:02 +0530 |
Signed-off-by: Aneesh Kumar K.V <address@hidden>
---
hw/9pfs/virtio-9p.c | 57 +++++++++++++++++----------------------------------
hw/9pfs/virtio-9p.h | 8 -------
2 files changed, 19 insertions(+), 46 deletions(-)
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index c4f47f7..3681459 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -1086,7 +1086,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));
@@ -1283,57 +1283,38 @@ out:
qemu_free(vs);
}
-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)
{
- V9fsPDU *pdu = opaque;
- V9fsState *s = pdu->s;
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;
+ V9fsPDU *pdu = opaque;
+ V9fsState *s = pdu->s;
- 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);
}
/* From Linux kernel code */
diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
index eb6cd23..a62eda0 100644
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -278,14 +278,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.4.1
- Re: [Qemu-devel] [PATCH -V4 01/26] coroutine: add gthread dependency, (continued)
- [Qemu-devel] [PATCH -V4 05/26] [virtio-9p] clean up v9fs_readlink., Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 06/26] [virtio-9p] coroutines for readlink, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 09/26] hw/9pfs: Add yield support for readdir related coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 04/26] [virtio-9p] Remove post functions for v9fs_readlink., Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 03/26] [virtio-9p] Change all pdu handlers to coroutines., Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 10/26] hw/9pfs: Update v9fs_readdir to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 12/26] hw/9pfs: Update v9fs_statfs to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 13/26] hw/9pfs: Add yield support to lstat coroutine, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 02/26] [virtio-9p] Add infrastructure to support glib threads and coroutines., Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 14/26] hw/9pfs: Update v9fs_getattr to use coroutines,
Aneesh Kumar K.V <=
- [Qemu-devel] [PATCH -V4 15/26] hw/9pfs: Add yield support to setattr related coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 17/26] hw/9pfs: Add yield support to xattr related coroutine, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 16/26] hw/9pfs: Update v9fs_setattr to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 18/26] hw/9pfs: Update v9fs_xattrwalk to coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 21/26] hw/9pfs: Update v9fs_mknod to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 20/26] hw/9pfs: Add yield support to mknod coroutine, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 19/26] hw/9pfs: Update v9fs_xattrcreate to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 23/26] [virtio-9p] Remove post functions for v9fs_remove, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 22/26] [virtio-9p] coroutine and threading for mkdir, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 25/26] [virtio-9p] coroutine and threading for remove/unlink, Aneesh Kumar K.V, 2011/08/08