From ed1fcd00094cdd9395315068442abe28f612e8a3 Mon Sep 17 00:00:00 2001 From: Craig Jellick Date: Fri, 17 Mar 2017 08:49:55 -0700 Subject: Add 'none' as type for drive's if option Signed-off-by: Craig Jellick Reviewed-by: Stefan Hajnoczi Signed-off-by: Michael Tokarev --- qemu-options.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qemu-options.hx') diff --git a/qemu-options.hx b/qemu-options.hx index f68829f3b0..a24fef2107 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -604,7 +604,7 @@ Special files such as iSCSI devices can be specified using protocol specific URLs. See the section for "Device URL Syntax" for more information. @item if=@var{interface} This option defines on which type on interface the drive is connected. -Available types are: ide, scsi, sd, mtd, floppy, pflash, virtio. +Available types are: ide, scsi, sd, mtd, floppy, pflash, virtio, none. @item bus=@var{bus},unit=@var{unit} These options define where is connected the drive by defining the bus number and the unit id. -- cgit v1.2.3 From 3baa0a6a658e3a17a79d95440e5c949b2b13bb6e Mon Sep 17 00:00:00 2001 From: Chris Webb Date: Thu, 24 Nov 2011 17:05:18 +0000 Subject: virtfs: allow a device id to be specified in the -virtfs option When using a virtfs root filesystem, the mount_tag needs to be set to /dev/root. This can be done long-hand as -fsdev local,id=root,path=/path/to/rootfs,... -device virtio-9p-pci,fsdev=root,mount_tag=/dev/root but the -virtfs shortcut cannot be used as it hard-codes the device identifier to match the mount_tag, and device identifiers may not contain '/': $ qemu-system-x86_64 -virtfs local,path=/foo,mount_tag=/dev/root,security_model=passthrough qemu-system-x86_64: -virtfs local,path=/foo,mount_tag=/dev/root,security_model=passthrough: duplicate fsdev id: /dev/root To support this case using -virtfs, we allow the device identifier to be specified explicitly when the mount_tag is not suitable: -virtfs local,id=root,path=/path/to/rootfs,mount_tag=/dev/root,... Signed-off-by: Chris Webb Signed-off-by: Michael Tokarev --- qemu-options.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qemu-options.hx') diff --git a/qemu-options.hx b/qemu-options.hx index a24fef2107..a5b0589cb7 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -876,7 +876,7 @@ ETEXI DEF("virtfs", HAS_ARG, QEMU_OPTION_virtfs, "-virtfs local,path=path,mount_tag=tag,security_model=[mapped-xattr|mapped-file|passthrough|none]\n" - " [,writeout=immediate][,readonly][,socket=socket|sock_fd=sock_fd]\n", + " [,id=id][,writeout=immediate][,readonly][,socket=socket|sock_fd=sock_fd]\n", QEMU_ARCH_ALL) STEXI -- cgit v1.2.3