From patchwork Thu May 19 02:56:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 96288 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 95110B6F6E for ; Thu, 19 May 2011 13:00:45 +1000 (EST) Received: from localhost ([::1]:47708 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMtTe-00023i-UJ for incoming@patchwork.ozlabs.org; Wed, 18 May 2011 23:00:42 -0400 Received: from eggs.gnu.org ([140.186.70.92]:35758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMtQe-0005LQ-0m for qemu-devel@nongnu.org; Wed, 18 May 2011 22:57:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QMtQd-0004uo-3a for qemu-devel@nongnu.org; Wed, 18 May 2011 22:57:35 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:57285) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMtQc-0004ue-TY for qemu-devel@nongnu.org; Wed, 18 May 2011 22:57:35 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e39.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p4J2haLJ024067 for ; Wed, 18 May 2011 20:43:36 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p4J2wkGw118440 for ; Wed, 18 May 2011 20:58:46 -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 p4IKuxg0015312 for ; Wed, 18 May 2011 14:57:00 -0600 Received: from oc6675851006.ibm.com (sig-9-65-27-236.mts.ibm.com [9.65.27.236]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p4IKuo4T014807; Wed, 18 May 2011 14:56:57 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Wed, 18 May 2011 19:56:58 -0700 Message-Id: <1305773834-16359-9-git-send-email-jvrao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1305773834-16359-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1305773834-16359-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.160 Cc: aliguori@us.ibm.com, "Venkateswararao Jujjuri \"" , stefanha@linux.vnet.ibm.com, "Aneesh Kumar K.V" Subject: [Qemu-devel] [V3 08/24] hw/9pfs: Add yield support for readdir related 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 From: Aneesh Kumar K.V This include readdir, telldir, seekdir, rewinddir. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri " --- Makefile.objs | 2 +- hw/9pfs/codir.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ hw/9pfs/virtio-9p-coth.h | 5 +++ 3 files changed, 72 insertions(+), 1 deletions(-) create mode 100644 hw/9pfs/codir.c diff --git a/Makefile.objs b/Makefile.objs index 36005bb..614bcaf 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -297,7 +297,7 @@ hw-obj-$(CONFIG_SOUND) += $(sound-obj-y) 9pfs-nested-$(CONFIG_VIRTFS) = virtio-9p.o virtio-9p-debug.o 9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-local.o virtio-9p-xattr.o 9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-xattr-user.o virtio-9p-posix-acl.o -9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-coth.o cofs.o +9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-coth.o cofs.o codir.o hw-obj-$(CONFIG_REALLY_VIRTFS) += $(addprefix 9pfs/, $(9pfs-nested-y)) $(addprefix 9pfs/, $(9pfs-nested-y)): QEMU_CFLAGS+=$(GLIB_CFLAGS) diff --git a/hw/9pfs/codir.c b/hw/9pfs/codir.c new file mode 100644 index 0000000..47b10df --- /dev/null +++ b/hw/9pfs/codir.c @@ -0,0 +1,66 @@ + +/* + * Virtio 9p backend + * + * Copyright IBM, Corp. 2011 + * + * Authors: + * Aneesh Kumar K.V + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ + +#include "fsdev/qemu-fsdev.h" +#include "qemu-thread.h" +#include "qemu-coroutine.h" +#include "virtio-9p-coth.h" + +int v9fs_co_readdir(V9fsState *s, V9fsFidState *fidp, struct dirent **dent) +{ + int err; + + v9fs_co_run_in_worker( + { + errno = 0; + /*FIXME!! need to switch to readdir_r */ + *dent = s->ops->readdir(&s->ctx, fidp->fs.dir); + if (!*dent && errno) { + err = -errno; + } else { + err = 0; + } + }); + return err; +} + +off_t v9fs_co_telldir(V9fsState *s, V9fsFidState *fidp) +{ + off_t err; + + v9fs_co_run_in_worker( + { + err = s->ops->telldir(&s->ctx, fidp->fs.dir); + if (err < 0) { + err = -errno; + } + }); + return err; +} + +void v9fs_co_seekdir(V9fsState *s, V9fsFidState *fidp, off_t offset) +{ + v9fs_co_run_in_worker( + { + s->ops->seekdir(&s->ctx, fidp->fs.dir, offset); + }); +} + +void v9fs_co_rewinddir(V9fsState *s, V9fsFidState *fidp) +{ + v9fs_co_run_in_worker( + { + s->ops->rewinddir(&s->ctx, fidp->fs.dir); + }); +} diff --git a/hw/9pfs/virtio-9p-coth.h b/hw/9pfs/virtio-9p-coth.h index 94c5147..9aa5953 100644 --- a/hw/9pfs/virtio-9p-coth.h +++ b/hw/9pfs/virtio-9p-coth.h @@ -57,4 +57,9 @@ typedef struct V9fsThPool { extern void co_run_in_worker_bh(void *); extern int v9fs_init_worker_threads(void); extern int v9fs_co_readlink(V9fsState *, V9fsString *, V9fsString *); +extern int v9fs_co_readdir(V9fsState *, V9fsFidState *, + struct dirent **); +extern off_t v9fs_co_telldir(V9fsState *, V9fsFidState *); +extern void v9fs_co_seekdir(V9fsState *, V9fsFidState *, off_t); +extern void v9fs_co_rewinddir(V9fsState *, V9fsFidState *); #endif