From patchwork Thu Apr 15 14:11:11 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: 50244 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 4EF38B7BEE for ; Fri, 16 Apr 2010 00:24:26 +1000 (EST) Received: from localhost ([127.0.0.1]:42177 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O2Pyl-00050O-4Y for incoming@patchwork.ozlabs.org; Thu, 15 Apr 2010 10:23:39 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O2PtM-0003Rc-N2 for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:18:04 -0400 Received: from [140.186.70.92] (port=50377 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O2PtE-0003H8-SQ for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:18:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O2PnC-0000Na-0M for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:12:04 -0400 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:47529) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O2PnA-0000Mf-8Z for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:11:41 -0400 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by e28smtp01.in.ibm.com (8.14.3/8.13.1) with ESMTP id o3FEBY0J015158 for ; Thu, 15 Apr 2010 19:41:34 +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 o3FEBYWm3559634 for ; Thu, 15 Apr 2010 19:41:34 +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 o3FEBXxt031084 for ; Thu, 15 Apr 2010 19:41:34 +0530 Received: from skywalker.in.ibm.com ([9.77.204.187]) by d28av01.in.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id o3FEBDaP030329; Thu, 15 Apr 2010 19:41:32 +0530 From: "Aneesh Kumar K.V" To: qemu-devel@nongnu.org Date: Thu, 15 Apr 2010 19:41:11 +0530 Message-Id: <1271340671-19558-22-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4.360.g11766c In-Reply-To: <1271340671-19558-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1271340671-19558-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 -V5 21/21] virtio-9p: Create a syntactic shortcut for the file-system pass-thru 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 Currently the commandline to create a virtual-filesystem pass-through between the guest and the host is as follows: #qemu -fsdev fstype,id=ID,path=path/to/share \ -device virtio-9p-pci,fsdev=ID,mount_tag=tag \ This patch provides a syntactic short-cut to achieve the same as follows: #qemu -virtfs fstype,path=path/to/share,mount_tag=tag This will be internally expanded as: #qemu -fsdev fstype,id=tag,path=path/to/share, \ -device virtio-9p-pci,fsdev=tag,mount_tag=tag \ Signed-off-by: Gautham R Shenoy Signed-off-by: Aneesh Kumar K.V --- qemu-config.c | 22 +++++++++++++++++++++ qemu-config.h | 1 + qemu-options.hx | 35 ++++++++++++++++++++++++++++++++++ vl.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+), 0 deletions(-) diff --git a/qemu-config.c b/qemu-config.c index 0fb5105..06a59eb 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -169,6 +169,28 @@ QemuOptsList qemu_fsdev_opts = { }; #endif +#ifdef CONFIG_LINUX_VIRTFS +QemuOptsList qemu_virtfs_opts = { + .name = "virtfs", + .implied_opt_name = "fstype", + .head = QTAILQ_HEAD_INITIALIZER(qemu_virtfs_opts.head), + .desc = { + { + .name = "fstype", + .type = QEMU_OPT_STRING, + }, { + .name = "path", + .type = QEMU_OPT_STRING, + }, { + .name = "mount_tag", + .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 d85bde7..546fc01 100644 --- a/qemu-config.h +++ b/qemu-config.h @@ -5,6 +5,7 @@ extern QemuOptsList qemu_drive_opts; extern QemuOptsList qemu_chardev_opts; #ifdef CONFIG_LINUX_VIRTFS extern QemuOptsList qemu_fsdev_opts; +extern QemuOptsList qemu_virtfs_opts; #endif extern QemuOptsList qemu_device_opts; extern QemuOptsList qemu_netdev_opts; diff --git a/qemu-options.hx b/qemu-options.hx index 508688d..3c6882e 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -510,6 +510,41 @@ Create a file-system-"device" for local-filesystem. ETEXI #endif +#ifdef CONFIG_LINUX_VIRTFS +DEFHEADING(Virtual File system pass-through options:) + +DEF("virtfs", HAS_ARG, QEMU_OPTION_virtfs, + "-virtfs local,path=path,mount_tag=tag\n", + QEMU_ARCH_ALL) + +STEXI + +The general form of a Virtual File system pass-through option is: +@table @option + +@item -virtfs @var{fstype} [,@var{options}] +@findex -virtfs +Fstype is one of: +@option{local}, +The specific Fstype will determine the applicable options. + +Options to each backend are described below. + +@item -virtfs local ,path=@var{path} ,mount_tag=@var{mount_tag} + +Create a Virtual file-system-pass through for local-filesystem. + +@option{local} is only available on Linux. + +@option{path} specifies the path to be exported. @option{path} is required. + +@option{mount_tag} specifies the tag with which the exported file is mounted. +@option{mount_tag} is required. + +@end table +ETEXI +#endif + DEFHEADING() DEF("name", HAS_ARG, QEMU_OPTION_name, diff --git a/vl.c b/vl.c index 7d743f1..b916617 100644 --- a/vl.c +++ b/vl.c @@ -3105,6 +3105,62 @@ int main(int argc, char **argv, char **envp) exit(1); } break; + case QEMU_OPTION_virtfs: { + char *arg_fsdev = NULL; + char *arg_9p = NULL; + int len = 0; + + opts = qemu_opts_parse(&qemu_virtfs_opts, optarg, 1); + if (!opts) { + fprintf(stderr, "parse error: %s\n", optarg); + exit(1); + } + + len = strlen(",id=,path="); + len += strlen(qemu_opt_get(opts, "fstype")); + len += strlen(qemu_opt_get(opts, "mount_tag")); + len += strlen(qemu_opt_get(opts, "path")); + arg_fsdev = qemu_malloc((len + 1) * sizeof(*arg_fsdev)); + + if (!arg_fsdev) { + fprintf(stderr, "No memory to parse -fsdev for %s\n", + optarg); + exit(1); + } + + sprintf(arg_fsdev, "%s,id=%s,path=%s", + qemu_opt_get(opts, "fstype"), + qemu_opt_get(opts, "mount_tag"), + qemu_opt_get(opts, "path")); + + len = strlen("virtio-9p-pci,fsdev=,mount_tag="); + len += 2*strlen(qemu_opt_get(opts, "mount_tag")); + arg_9p = qemu_malloc((len + 1) * sizeof(*arg_9p)); + + if (!arg_9p) { + fprintf(stderr, "No memory to parse -device for %s\n", + optarg); + exit(1); + } + + sprintf(arg_9p, "virtio-9p-pci,fsdev=%s,mount_tag=%s", + qemu_opt_get(opts, "mount_tag"), + qemu_opt_get(opts, "mount_tag")); + + if (!qemu_opts_parse(&qemu_fsdev_opts, arg_fsdev, 1)) { + fprintf(stderr, "parse error [fsdev]: %s\n", optarg); + exit(1); + } + + if (!qemu_opts_parse(&qemu_device_opts, arg_9p, 1)) { + fprintf(stderr, "parse error [device]: %s\n", optarg); + exit(1); + } + + qemu_free(arg_fsdev); + qemu_free(arg_9p); + break; + } #endif case QEMU_OPTION_serial: add_device_config(DEV_SERIAL, optarg);