From patchwork Mon Aug 8 17:04:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 109073 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 76C94B6F71 for ; Tue, 9 Aug 2011 04:49:40 +1000 (EST) Received: from localhost ([::1]:41524 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTHE-0001eU-RZ for incoming@patchwork.ozlabs.org; Mon, 08 Aug 2011 13:06:08 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTG5-0006yb-7A for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:04:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QqTG4-0001hK-0q for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:04:57 -0400 Received: from e23smtp02.au.ibm.com ([202.81.31.144]:36129) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTG3-0001gw-Bk for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:04:55 -0400 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp02.au.ibm.com (8.14.4/8.13.1) with ESMTP id p78GwcOI021573 for ; Tue, 9 Aug 2011 02:58:38 +1000 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p78H4r3U1417318 for ; Tue, 9 Aug 2011 03:04:53 +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 p78H4rpd029801 for ; Tue, 9 Aug 2011 03:04:53 +1000 Received: from skywalker.ibm.com ([9.80.65.225]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p78H4PcC029309; Tue, 9 Aug 2011 03:04:52 +1000 From: "Aneesh Kumar K.V" To: qemu-devel@nongnu.org Date: Mon, 8 Aug 2011 22:34:02 +0530 Message-Id: <1312823054-28331-15-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.4.1 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> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 202.81.31.144 Cc: aliguori@us.ibm.com, "Aneesh Kumar K.V" Subject: [Qemu-devel] [PATCH -V4 14/26] hw/9pfs: Update v9fs_getattr to use coroutines X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Aneesh Kumar K.V --- 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;