From patchwork Tue May 17 19:43:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 96012 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 9CD23B6EED for ; Wed, 18 May 2011 05:45:01 +1000 (EST) Received: from localhost ([::1]:52678 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMQCQ-0002Iv-RM for incoming@patchwork.ozlabs.org; Tue, 17 May 2011 15:44:58 -0400 Received: from eggs.gnu.org ([140.186.70.92]:34464) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMQBw-0002FY-9B for qemu-devel@nongnu.org; Tue, 17 May 2011 15:44:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QMQBu-00020V-Rc for qemu-devel@nongnu.org; Tue, 17 May 2011 15:44:28 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:40278) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMQBu-000204-M8 for qemu-devel@nongnu.org; Tue, 17 May 2011 15:44:26 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e37.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p4HJfSck003598 for ; Tue, 17 May 2011 13:41:28 -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 p4HJiIat149012 for ; Tue, 17 May 2011 13:44:18 -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 p4HDhmZ5018144 for ; Tue, 17 May 2011 07:43:50 -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 p4HDhZkO016491; Tue, 17 May 2011 07:43:48 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Tue, 17 May 2011 12:43:35 -0700 Message-Id: <1305661431-21289-10-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.158 Cc: aliguori@us.ibm.com, "Venkateswararao Jujjuri \"" , stefanha@linux.vnet.ibm.com, "Aneesh Kumar K.V" Subject: [Qemu-devel] [V2 09/25] 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 | 68 ++++++++++++++++++++++++++++++++++++++++++++++ hw/9pfs/virtio-9p-coth.h | 5 +++ 3 files changed, 74 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..885f7d0 --- /dev/null +++ b/hw/9pfs/codir.c @@ -0,0 +1,68 @@ + +/* + * 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); + }); + return; +} + +void v9fs_co_rewinddir(V9fsState *s, V9fsFidState *fidp) +{ + v9fs_co_run_in_worker( + { + s->ops->rewinddir(&s->ctx, fidp->fs.dir); + }); + return; +} 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