From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:43572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTGE-0007Td-UL for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:05:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QqTGC-0001jd-T3 for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:05:06 -0400 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:36608) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTGC-0001jA-B7 for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:05:04 -0400 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [202.81.31.246]) by e23smtp07.au.ibm.com (8.14.4/8.13.1) with ESMTP id p78H53bw024587 for ; Tue, 9 Aug 2011 03:05:03 +1000 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p78H472K1523944 for ; Tue, 9 Aug 2011 03:04:07 +1000 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p78H52lk030024 for ; Tue, 9 Aug 2011 03:05:02 +1000 From: "Aneesh Kumar K.V" Date: Mon, 8 Aug 2011 22:34:07 +0530 Message-Id: <1312823054-28331-20-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1312823054-28331-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1312823054-28331-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH -V4 19/26] hw/9pfs: Update v9fs_xattrcreate to use coroutines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, "Aneesh Kumar K.V" Signed-off-by: Aneesh Kumar K.V --- 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