From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50483) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKcxh-0000zs-VR for qemu-devel@nongnu.org; Thu, 12 May 2011 16:58:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QKcxg-0001p0-Uh for qemu-devel@nongnu.org; Thu, 12 May 2011 16:58:21 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:48455) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKcxg-0001ot-O9 for qemu-devel@nongnu.org; Thu, 12 May 2011 16:58:20 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e35.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p4CKfN6J022397 for ; Thu, 12 May 2011 14:41:23 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id p4CKwF9r088412 for ; Thu, 12 May 2011 14:58:15 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p4CEvmqr000566 for ; Thu, 12 May 2011 08:57:48 -0600 From: "Venkateswararao Jujjuri (JV)" Date: Thu, 12 May 2011 13:57:36 -0700 Message-Id: <1305233867-4367-15-git-send-email-jvrao@linux.vnet.ibm.com> In-Reply-To: <1305233867-4367-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1305233867-4367-1-git-send-email-jvrao@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 14/25] hw/9pfs: Update v9fs_getattr 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, "Venkateswararao Jujjuri \"" , stefanha@linux.vnet.ibm.com, "Aneesh Kumar K.V" From: Aneesh Kumar K.V Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri " --- 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