From patchwork Fri Apr 9 11:43:04 2010 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: 49823 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BD5CCB7CF0 for ; Fri, 9 Apr 2010 21:48:06 +1000 (EST) Received: from localhost ([127.0.0.1]:52491 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O0Cgr-0002n9-H0 for incoming@patchwork.ozlabs.org; Fri, 09 Apr 2010 07:48:01 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O0Ccl-0001cg-To for qemu-devel@nongnu.org; Fri, 09 Apr 2010 07:43:48 -0400 Received: from [140.186.70.92] (port=56425 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O0Ccg-0001aC-4e for qemu-devel@nongnu.org; Fri, 09 Apr 2010 07:43:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O0CcZ-00083G-SU for qemu-devel@nongnu.org; Fri, 09 Apr 2010 07:43:42 -0400 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:37621) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O0CcY-00082D-JH for qemu-devel@nongnu.org; Fri, 09 Apr 2010 07:43:35 -0400 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by e28smtp06.in.ibm.com (8.14.3/8.13.1) with ESMTP id o39BhTUU010294 for ; Fri, 9 Apr 2010 17:13:29 +0530 Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o39BhSOc3096606 for ; Fri, 9 Apr 2010 17:13:28 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o39BhStS001525 for ; Fri, 9 Apr 2010 17:13:28 +0530 Received: from skywalker.in.ibm.com ([9.124.221.5]) by d28av01.in.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id o39BhQHg001478; Fri, 9 Apr 2010 17:13:27 +0530 From: "Aneesh Kumar K.V" To: qemu-devel@nongnu.org Date: Fri, 9 Apr 2010 17:13:04 +0530 Message-Id: <1270813404-23004-2-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4.360.g11766c In-Reply-To: <1270813404-23004-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1270813404-23004-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) Cc: ericvh@gmail.com, aliguori@us.ibm.com, aneesh.kumar@linux.vnet.ibm.com, Gautham R Shenoy Subject: [Qemu-devel] [PATCH -V4 01/21] virtio-9p: Create a commandline option -fsdev X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Gautham R Shenoy This patch creates a new command line option named -fsdev to hold any file system specific information. The option will currently hold the following attributes: -fsdev fstype id=id,path=path_to_share where fstype: Type of the file system. id: Identifier used to refer to this fsdev path: The path on the host that is identified by this fsdev. [aneesh.kumar@linux.vnet.ibm.com: Abstraction using FsContext] Signed-off-by: Gautham R Shenoy Signed-off-by: Aneesh Kumar K.V --- Makefile.objs | 5 +++- configure | 25 ++++++++++++++++++- fsdev/qemu-fsdev.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++ fsdev/qemu-fsdev.h | 53 +++++++++++++++++++++++++++++++++++++++ hw/file-op-9p.h | 32 +++++++++++++++++++++++ qemu-config.c | 18 +++++++++++++ qemu-config.h | 3 ++ qemu-options.hx | 33 ++++++++++++++++++++++++ vl.c | 27 ++++++++++++++++++++ 9 files changed, 264 insertions(+), 2 deletions(-) create mode 100644 fsdev/qemu-fsdev.c create mode 100644 fsdev/qemu-fsdev.h create mode 100644 hw/file-op-9p.h diff --git a/Makefile.objs b/Makefile.objs index 281f7a6..41c3c6c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -35,6 +35,9 @@ net-nested-$(CONFIG_SLIRP) += slirp.o net-nested-$(CONFIG_VDE) += vde.o net-obj-y += $(addprefix net/, $(net-nested-y)) +fsdev-nested-$(CONFIG_LINUX_VIRTFS) = qemu-fsdev.o +fsdev-obj-$(CONFIG_LINUX_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y)) + ###################################################################### # libqemu_common.a: Target independent part of system emulation. The # long term path is to suppress *all* target specific code in case of @@ -44,8 +47,8 @@ net-obj-y += $(addprefix net/, $(net-nested-y)) common-obj-y = $(block-obj-y) common-obj-y += $(net-obj-y) common-obj-y += $(qobject-obj-y) +common-obj-$(CONFIG_LINUX_VIRTFS) += $(fsdev-obj-$(CONFIG_LINUX_VIRTFS)) common-obj-y += readline.o console.o async.o qemu-error.o - common-obj-y += tcg-runtime.o host-utils.o common-obj-y += irq.o ioport.o input.o common-obj-$(CONFIG_PTIMER) += ptimer.o diff --git a/configure b/configure index 6bc40a3..171c1f0 100755 --- a/configure +++ b/configure @@ -263,6 +263,7 @@ vnc_tls="" vnc_sasl="" xen="" linux_aio="" +linux_virtfs="" gprof="no" debug_tcg="no" @@ -651,6 +652,11 @@ for opt do ;; --enable-docs) docs="yes" ;; + --disable-linux-virtfs) linux_virtfs="no" + ;; + --enable-linux-virtfs) linux_virtfs="yes" + + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -806,6 +812,8 @@ echo " --disable-blobs disable installing provided firmware blobs" echo " --kerneldir=PATH look for kernel includes in PATH" echo " --enable-docs enable documentation build" echo " --disable-docs disable documentation build" +echo " --disable-linux-virtfs disable Linux VIRTFS support" +echo " --enable-linux-virtfs enable Linux VIRTFS support" echo "" echo "NOTE: The object files are built at the place where configure is launched" exit 1 @@ -1541,7 +1549,18 @@ EOF linux_aio=no fi fi - +######################################## +# linux-virtfs probe +if test "$linux_virtfs" != "no" ; then + if test "$linux" = "no" ; then + if test "$linux_virtfs" = "yes" ; then + feature_not_found "linux virtfs" + fi + linux_virtfs="no" + else + linux_virtfs="yes" + fi +fi ########################################## # iovec probe cat > $TMPC < Your SDL version is too old - please upgrade to have SDL support" @@ -2183,6 +2203,9 @@ fi if test "$fdatasync" = "yes" ; then echo "CONFIG_FDATASYNC=y" >> $config_host_mak fi +if test "$linux_virtfs" = "yes" ; then + echo "CONFIG_LINUX_VIRTFS=y" >> $config_host_mak +fi # XXX: suppress that if [ "$bsd" = "yes" ] ; then diff --git a/fsdev/qemu-fsdev.c b/fsdev/qemu-fsdev.c new file mode 100644 index 0000000..48bbfd9 --- /dev/null +++ b/fsdev/qemu-fsdev.c @@ -0,0 +1,70 @@ +/* + * Virtio 9p + * + * Copyright IBM, Corp. 2010 + * + * Authors: + * Gautham R Shenoy + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ +#include +#include +#include "qemu-fsdev.h" +#include "qemu-queue.h" +#include "osdep.h" +#include "qemu-common.h" + +static QTAILQ_HEAD(FsTypeEntry_head, FsTypeListEntry) fstype_entries = + QTAILQ_HEAD_INITIALIZER(fstype_entries); + +static FsTypeTable FsTypes[] = { + { .name = "local", .ops = NULL}, +}; + +int qemu_fsdev_add(QemuOpts *opts) +{ + struct FsTypeListEntry *fsle; + int i; + + if (qemu_opts_id(opts) == NULL) { + fprintf(stderr, "fsdev: No id specified\n"); + return -1; + } + + for (i = 0; i < ARRAY_SIZE(FsTypes); i++) { + if (strcmp(FsTypes[i].name, qemu_opt_get(opts, "fstype")) == 0) { + break; + } + } + + if (i == ARRAY_SIZE(FsTypes)) { + fprintf(stderr, "fsdev: fstype %s not found\n", + qemu_opt_get(opts, "fstype")); + return -1; + } + + fsle = qemu_malloc(sizeof(*fsle)); + + fsle->fse.fsdev_id = qemu_strdup(qemu_opts_id(opts)); + fsle->fse.path = qemu_strdup(qemu_opt_get(opts, "path")); + fsle->fse.ops = FsTypes[i].ops; + + QTAILQ_INSERT_TAIL(&fstype_entries, fsle, next); + return 0; + +} + +FsTypeEntry *get_fsdev_fsentry(char *id) +{ + struct FsTypeListEntry *fsle; + + QTAILQ_FOREACH(fsle, &fstype_entries, next) { + if (strcmp(fsle->fse.fsdev_id, id) == 0) { + return &fsle->fse; + } + } + return NULL; +} diff --git a/fsdev/qemu-fsdev.h b/fsdev/qemu-fsdev.h new file mode 100644 index 0000000..7fa4f60 --- /dev/null +++ b/fsdev/qemu-fsdev.h @@ -0,0 +1,53 @@ +/* + * Virtio 9p + * + * Copyright IBM, Corp. 2010 + * + * Authors: + * Gautham R Shenoy + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ +#ifndef QEMU_FSDEV_H +#define QEMU_FSDEV_H +#include "qemu-option.h" +#include "hw/file-op-9p.h" + + +/* + * A table to store the various file systems and their callback operations. + * ----------------- + * fstype | ops + * ----------------- + * local | local_ops + * . | + * . | + * . | + * . | + * ----------------- + * etc + */ +typedef struct FsTypeTable { + const char *name; + FileOperations *ops; +} FsTypeTable; + +/* + * Structure to store the various fsdev's passed through command line. + */ +typedef struct FsTypeEntry { + char *fsdev_id; + char *path; + FileOperations *ops; +} FsTypeEntry; + +typedef struct FsTypeListEntry { + FsTypeEntry fse; + QTAILQ_ENTRY(FsTypeListEntry) next; +} FsTypeListEntry; + +extern int qemu_fsdev_add(QemuOpts *opts); +extern FsTypeEntry *get_fsdev_fsentry(char *id); +#endif diff --git a/hw/file-op-9p.h b/hw/file-op-9p.h new file mode 100644 index 0000000..7cde63c --- /dev/null +++ b/hw/file-op-9p.h @@ -0,0 +1,32 @@ +/* + * Virtio 9p + * + * Copyright IBM, Corp. 2010 + * + * 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. + * + */ +#ifndef _FILEOP_H +#define _FILEOP_H +#include +#include +#include +#include +#include +#include + +typedef struct FsContext +{ + char *fs_root; + uid_t uid; +} FsContext; + +typedef struct FileOperations +{ + void *opaque; +} FileOperations; +#endif diff --git a/qemu-config.c b/qemu-config.c index 150157c..0fb5105 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -151,6 +151,24 @@ QemuOptsList qemu_chardev_opts = { }, }; +#ifdef CONFIG_LINUX_VIRTFS +QemuOptsList qemu_fsdev_opts = { + .name = "fsdev", + .implied_opt_name = "fstype", + .head = QTAILQ_HEAD_INITIALIZER(qemu_fsdev_opts.head), + .desc = { + { + .name = "fstype", + .type = QEMU_OPT_STRING, + }, { + .name = "path", + .type = QEMU_OPT_STRING, + }, + { /*End of list */ } + }, +}; +#endif + QemuOptsList qemu_device_opts = { .name = "device", .implied_opt_name = "driver", diff --git a/qemu-config.h b/qemu-config.h index f217c58..d85bde7 100644 --- a/qemu-config.h +++ b/qemu-config.h @@ -3,6 +3,9 @@ extern QemuOptsList qemu_drive_opts; extern QemuOptsList qemu_chardev_opts; +#ifdef CONFIG_LINUX_VIRTFS +extern QemuOptsList qemu_fsdev_opts; +#endif extern QemuOptsList qemu_device_opts; extern QemuOptsList qemu_netdev_opts; extern QemuOptsList qemu_net_opts; diff --git a/qemu-options.hx b/qemu-options.hx index 8450b45..e007df8 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -469,6 +469,39 @@ To get a help on possible @var{driver}s, @var{option}s or @var{value}s, use @code{-device @var{driver},@var{option}=?}. ETEXI +#ifdef CONFIG_LINUX_VIRTFS +DEFHEADING(File system options:) + +DEF("fsdev", HAS_ARG, QEMU_OPTION_fsdev, + "-fsdev local,id=id,path=path\n") + +STEXI + +The general form of a File system device option is: +@table @option + +@item -fsdev @var{fstype} ,id=@var{id} [,@var{options}] +@findex -fsdev +Fstype is one of: +@option{local}, +The specific Fstype will determine the applicable options. + +Options to each backend are described below. + +@item -fsdev local ,id=@var{id} ,path=@var{path} + +Create a file-system-"device" for local-filesystem. + +@option{local} is only available on Linux. + +@option{path} specifies the path to be exported. @option{path} is required. + +@end table +ETEXI +#endif + +DEFHEADING() + DEF("name", HAS_ARG, QEMU_OPTION_name, "-name string1[,process=string2]\n" " set the name of the guest\n" diff --git a/vl.c b/vl.c index d69250c..4359825 100644 --- a/vl.c +++ b/vl.c @@ -150,6 +150,9 @@ int main(int argc, char **argv) #include "qemu-option.h" #include "qemu-config.h" #include "qemu-objects.h" +#ifdef CONFIG_LINUX_VIRTFS +#include "fsdev/qemu-fsdev.h" +#endif #include "disas.h" @@ -3461,6 +3464,16 @@ static int chardev_init_func(QemuOpts *opts, void *opaque) return 0; } +#ifdef CONFIG_LINUX_VIRTFS +static int fsdev_init_func(QemuOpts *opts, void *opaque) +{ + int ret; + ret = qemu_fsdev_add(opts); + + return ret; +} +#endif + static int mon_init_func(QemuOpts *opts, void *opaque) { CharDriverState *chr; @@ -4256,6 +4269,15 @@ int main(int argc, char **argv, char **envp) exit(1); } break; +#ifdef CONFIG_LINUX_VIRTFS + case QEMU_OPTION_fsdev: + opts = qemu_opts_parse(&qemu_fsdev_opts, optarg, 1); + if (!opts) { + fprintf(stderr, "parse error: %s\n", optarg); + exit(1); + } + break; +#endif case QEMU_OPTION_serial: add_device_config(DEV_SERIAL, optarg); default_serial = 0; @@ -4625,6 +4647,11 @@ int main(int argc, char **argv, char **envp) if (qemu_opts_foreach(&qemu_chardev_opts, chardev_init_func, NULL, 1) != 0) exit(1); +#ifdef CONFIG_LINUX_VIRTFS + if (qemu_opts_foreach(&qemu_fsdev_opts, fsdev_init_func, NULL, 1) != 0) { + exit(1); + } +#endif #ifndef _WIN32 if (daemonize) {