[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH -V4 19/26] hw/9pfs: Update v9fs_xattrcreate to use c
From: |
Aneesh Kumar K.V |
Subject: |
[Qemu-devel] [PATCH -V4 19/26] hw/9pfs: Update v9fs_xattrcreate to use coroutines |
Date: |
Mon, 8 Aug 2011 22:34:07 +0530 |
Signed-off-by: Aneesh Kumar K.V <address@hidden>
---
hw/9pfs/virtio-9p.c | 53 +++++++++++++++++++++++++--------------------------
hw/9pfs/virtio-9p.h | 11 ----------
2 files changed, 26 insertions(+), 38 deletions(-)
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index ac47abd..897f541 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -3316,43 +3316,42 @@ out:
static void v9fs_xattrcreate(void *opaque)
{
- V9fsPDU *pdu = opaque;
- V9fsState *s = pdu->s;
int flags;
int32_t fid;
+ int64_t size;
ssize_t err = 0;
- V9fsXattrState *vs;
-
- vs = qemu_malloc(sizeof(*vs));
- vs->pdu = pdu;
- vs->offset = 7;
+ V9fsString name;
+ size_t offset = 7;
+ V9fsFidState *file_fidp;
+ V9fsFidState *xattr_fidp;
+ V9fsPDU *pdu = opaque;
+ V9fsState *s = pdu->s;
- pdu_unmarshal(vs->pdu, vs->offset, "dsqd",
- &fid, &vs->name, &vs->size, &flags);
+ pdu_unmarshal(pdu, offset, "dsqd",
+ &fid, &name, &size, &flags);
- vs->file_fidp = lookup_fid(s, fid);
- if (vs->file_fidp == NULL) {
+ file_fidp = lookup_fid(s, fid);
+ if (file_fidp == NULL) {
err = -EINVAL;
goto out;
}
-
/* Make the file fid point to xattr */
- vs->xattr_fidp = vs->file_fidp;
- vs->xattr_fidp->fid_type = P9_FID_XATTR;
- vs->xattr_fidp->fs.xattr.copied_len = 0;
- vs->xattr_fidp->fs.xattr.len = vs->size;
- vs->xattr_fidp->fs.xattr.flags = flags;
- v9fs_string_init(&vs->xattr_fidp->fs.xattr.name);
- v9fs_string_copy(&vs->xattr_fidp->fs.xattr.name, &vs->name);
- if (vs->size)
- vs->xattr_fidp->fs.xattr.value = qemu_malloc(vs->size);
- else
- vs->xattr_fidp->fs.xattr.value = NULL;
-
+ xattr_fidp = file_fidp;
+ xattr_fidp->fid_type = P9_FID_XATTR;
+ xattr_fidp->fs.xattr.copied_len = 0;
+ xattr_fidp->fs.xattr.len = size;
+ xattr_fidp->fs.xattr.flags = flags;
+ v9fs_string_init(&xattr_fidp->fs.xattr.name);
+ v9fs_string_copy(&xattr_fidp->fs.xattr.name, &name);
+ if (size) {
+ xattr_fidp->fs.xattr.value = qemu_malloc(size);
+ } else {
+ xattr_fidp->fs.xattr.value = NULL;
+ }
+ err = offset;
out:
- complete_pdu(s, vs->pdu, err);
- v9fs_string_free(&vs->name);
- qemu_free(vs);
+ complete_pdu(s, pdu, err);
+ v9fs_string_free(&name);
}
static void v9fs_readlink(void *opaque)
diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
index 6a82649..3ed46ab 100644
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -399,17 +399,6 @@ typedef struct V9fsRenameState {
V9fsString name;
} V9fsRenameState;
-typedef struct V9fsXattrState
-{
- V9fsPDU *pdu;
- size_t offset;
- V9fsFidState *file_fidp;
- V9fsFidState *xattr_fidp;
- V9fsString name;
- int64_t size;
- int flags;
- void *value;
-} V9fsXattrState;
#define P9_LOCK_SUCCESS 0
#define P9_LOCK_BLOCKED 1
--
1.7.4.1
- [Qemu-devel] [PATCH -V4 12/26] hw/9pfs: Update v9fs_statfs to use coroutines, (continued)
- [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, 2011/08/08
- [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 <=
- [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
- [Qemu-devel] [PATCH -V4 24/26] [virtio-9p] clean up v9fs_remove., Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 26/26] hw/9pfs: Add yeild support to rename coroutine, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 08/26] [virtio-9p] clean up v9fs_mkdir., Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 11/26] hw/9pfs: Add yield support to statfs coroutine, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PULL] [PATCHSET 1] VirtFS coroutine changes, Aneesh Kumar K.V, 2011/08/11