diff options
| -rw-r--r-- | qemu-config.c | 22 | ||||
| -rw-r--r-- | qemu-config.h | 1 | ||||
| -rw-r--r-- | qemu-options.hx | 35 | ||||
| -rw-r--r-- | vl.c | 56 |
4 files changed, 114 insertions, 0 deletions
diff --git a/qemu-config.c b/qemu-config.c index cda5060e5f..d5008851cb 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -169,6 +169,28 @@ QemuOptsList qemu_fsdev_opts = { }; #endif +#ifdef CONFIG_LINUX +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 5f3480333e..dca69d454b 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 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 e754ba116b..12f6b5179d 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 +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, @@ -3102,6 +3102,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); |