From patchwork Mon Aug 8 17:03:53 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: 108997 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 9FB83B6F6F for ; Tue, 9 Aug 2011 03:05:07 +1000 (EST) Received: from localhost ([::1]:35661 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTGC-0006jv-1H for incoming@patchwork.ozlabs.org; Mon, 08 Aug 2011 13:05:04 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTFx-0006b5-8P for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:04:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QqTFt-0001ds-LQ for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:04:49 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:48108) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTFt-0001cw-46 for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:04:45 -0400 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [202.81.31.246]) by e23smtp05.au.ibm.com (8.14.4/8.13.1) with ESMTP id p78Gw6Js012392 for ; Tue, 9 Aug 2011 02:58:06 +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 p78H3gma688136 for ; Tue, 9 Aug 2011 03:03:42 +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 p78H4bFB029463 for ; Tue, 9 Aug 2011 03:04:37 +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 p78H4Pc3029309; Tue, 9 Aug 2011 03:04:35 +1000 From: "Aneesh Kumar K.V" To: qemu-devel@nongnu.org Date: Mon, 8 Aug 2011 22:33:53 +0530 Message-Id: <1312823054-28331-6-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.147 Cc: aliguori@us.ibm.com, "Venkateswararao Jujjuri \(JV\)" , "Aneesh Kumar K.V" Subject: [Qemu-devel] [PATCH -V4 05/26] [virtio-9p] clean up v9fs_readlink. 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 From: Venkateswararao Jujjuri (JV) Rearrange the code so that we can avoid V9fsReadLinkState. Signed-off-by: Venkateswararao Jujjuri " Signed-off-by: Aneesh Kumar K.V --- hw/9pfs/virtio-9p.c | 25 ++++++++++--------------- hw/9pfs/virtio-9p.h | 7 ------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index fa83058..63217e9 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -3585,35 +3585,30 @@ out: static void v9fs_readlink(void *opaque) { V9fsPDU *pdu = opaque; - V9fsState *s = pdu->s; + size_t offset = 7; + V9fsString target; int32_t fid; - V9fsReadLinkState *vs; int err = 0; V9fsFidState *fidp; - vs = qemu_malloc(sizeof(*vs)); - vs->pdu = pdu; - vs->offset = 7; - - pdu_unmarshal(vs->pdu, vs->offset, "d", &fid); - fidp = lookup_fid(s, fid); + pdu_unmarshal(pdu, offset, "d", &fid); + fidp = lookup_fid(pdu->s, fid); if (fidp == NULL) { err = -ENOENT; goto out; } - v9fs_string_init(&vs->target); - err = v9fs_do_readlink(s, &fidp->path, &vs->target); + v9fs_string_init(&target); + err = v9fs_do_readlink(pdu->s, &fidp->path, &target); if (err < 0) { err = -errno; goto out; } - vs->offset += pdu_marshal(vs->pdu, vs->offset, "s", &vs->target); - err = vs->offset; + offset += pdu_marshal(pdu, offset, "s", &target); + err = offset; out: - complete_pdu(s, vs->pdu, err); - v9fs_string_free(&vs->target); - qemu_free(vs); + v9fs_string_free(&target); + complete_pdu(pdu->s, pdu, err); } static CoroutineEntry *pdu_co_handlers[] = { diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h index fb1e465..e95b63d 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -495,13 +495,6 @@ typedef struct V9fsGetlockState V9fsGetlock *glock; } V9fsGetlockState; -typedef struct V9fsReadLinkState -{ - V9fsPDU *pdu; - size_t offset; - V9fsString target; -} V9fsReadLinkState; - size_t pdu_packunpack(void *addr, struct iovec *sg, int sg_count, size_t offset, size_t size, int pack);