From patchwork Tue May 17 19:43:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 96010 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 29119B6EED for ; Wed, 18 May 2011 05:44:57 +1000 (EST) Received: from localhost ([::1]:52570 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMQCM-0002Ek-80 for incoming@patchwork.ozlabs.org; Tue, 17 May 2011 15:44:54 -0400 Received: from eggs.gnu.org ([140.186.70.92]:34352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMQBt-0002EX-FK for qemu-devel@nongnu.org; Tue, 17 May 2011 15:44:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QMQBs-0001zX-EG for qemu-devel@nongnu.org; Tue, 17 May 2011 15:44:25 -0400 Received: from e32.co.us.ibm.com ([32.97.110.150]:53014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMQBs-0001zD-4f for qemu-devel@nongnu.org; Tue, 17 May 2011 15:44:24 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e32.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p4HJWr1R016842 for ; Tue, 17 May 2011 13:32:53 -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 p4HJiEYP124540 for ; Tue, 17 May 2011 13:44:14 -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 p4HDhjO7017584 for ; Tue, 17 May 2011 07:43:46 -0600 Received: from oc6675851006.ibm.com (dyn9047029068.beaverton.ibm.com [9.47.29.68]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p4HDhZkK016491; Tue, 17 May 2011 07:43:44 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Tue, 17 May 2011 12:43:31 -0700 Message-Id: <1305661431-21289-6-git-send-email-jvrao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1305661431-21289-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1305661431-21289-1-git-send-email-jvrao@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.110.150 Cc: aliguori@us.ibm.com, "Venkateswararao Jujjuri \(JV\)" , stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [V2 05/25] [virtio-9p] Move errno into v9fs_do_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 Signed-off-by: Venkateswararao Jujjuri " --- hw/9pfs/virtio-9p.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index e0e7eed..cc22a1f 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -82,19 +82,21 @@ static int v9fs_do_lstat(V9fsState *s, V9fsString *path, struct stat *stbuf) return s->ops->lstat(&s->ctx, path->data, stbuf); } -static ssize_t v9fs_do_readlink(V9fsState *s, V9fsString *path, V9fsString *buf) +static int v9fs_do_readlink(V9fsState *s, V9fsString *path, V9fsString *buf, + ssize_t *len) { - ssize_t len; - + int err; buf->data = qemu_malloc(1024); - len = s->ops->readlink(&s->ctx, path->data, buf->data, 1024 - 1); - if (len > -1) { - buf->size = len; - buf->data[len] = 0; + *len = s->ops->readlink(&s->ctx, path->data, buf->data, 1024 - 1); + if (*len > -1) { + buf->size = *len; + buf->data[*len] = 0; + err = 0; + } else { + err = -errno; } - - return len; + return err; } static int v9fs_do_close(V9fsState *s, int fd) @@ -1055,13 +1057,11 @@ static int stat_to_v9stat(V9fsState *s, V9fsString *name, v9fs_string_null(&v9stat->extension); if (v9stat->mode & P9_STAT_MODE_SYMLINK) { - err = v9fs_do_readlink(s, name, &v9stat->extension); - if (err == -1) { - err = -errno; + ssize_t symlink_len; + err = v9fs_do_readlink(s, name, &v9stat->extension, &symlink_len); + if (err < 0) { return err; } - v9stat->extension.data[err] = 0; - v9stat->extension.size = err; } else if (v9stat->mode & P9_STAT_MODE_DEVICE) { v9fs_string_sprintf(&v9stat->extension, "%c %u %u", S_ISCHR(stbuf->st_mode) ? 'c' : 'b', @@ -3591,6 +3591,7 @@ static void v9fs_readlink(void *opaque) int32_t fid; int err = 0; V9fsFidState *fidp; + ssize_t symlink_len; pdu_unmarshal(pdu, offset, "d", &fid); fidp = lookup_fid(pdu->s, fid); @@ -3600,9 +3601,8 @@ static void v9fs_readlink(void *opaque) } v9fs_string_init(&target); - err = v9fs_do_readlink(pdu->s, &fidp->path, &target); + err = v9fs_do_readlink(pdu->s, &fidp->path, &target, &symlink_len); if (err < 0) { - err = -errno; goto out; } offset += pdu_marshal(pdu, offset, "s", &target);