aboutsummaryrefslogtreecommitdiff
path: root/qemu-options.hx
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-03-04 08:22:48 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2013-03-04 08:22:48 -0600
commit71df81afc618da79008a7071a666cf97b62e1237 (patch)
tree9452cebbcd6f1b769b460b4994f6a748e82c9b0f /qemu-options.hx
parenta6900601caf2286a704bdc42da33e98c65feb3a9 (diff)
parent272d2d8e1241b92ab9be87b2c8fb590fd84987a8 (diff)
Merge remote-tracking branch 'stefanha/block' into staging
# By MORITA Kazutaka (5) and others # Via Stefan Hajnoczi * stefanha/block: block: for HMP commit() operations on 'all', skip non-COW drives sheepdog: add support for connecting to unix domain socket sheepdog: use inet_connect to simplify connect code sheepdog: accept URIs move socket_set_nodelay to osdep.c slirp/tcp_subr.c: fix coding style in tcp_connect dataplane: remove EventPoll in favor of AioContext virtio-blk: fix unplug + virsh reboot ide/macio: Fix macio DMA initialisation.
Diffstat (limited to 'qemu-options.hx')
-rw-r--r--qemu-options.hx18
1 files changed, 4 insertions, 14 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index 863069f293..6f9334a97f 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2108,23 +2108,13 @@ QEMU supports using either local sheepdog devices or remote networked
devices.
Syntax for specifying a sheepdog device
-@table @list
-``sheepdog:<vdiname>''
-
-``sheepdog:<vdiname>:<snapid>''
-
-``sheepdog:<vdiname>:<tag>''
-
-``sheepdog:<host>:<port>:<vdiname>''
-
-``sheepdog:<host>:<port>:<vdiname>:<snapid>''
-
-``sheepdog:<host>:<port>:<vdiname>:<tag>''
-@end table
+@example
+sheepdog[+tcp|+unix]://[host:port]/vdiname[?socket=path][#snapid|#tag]
+@end example
Example
@example
-qemu-system-i386 --drive file=sheepdog:192.0.2.1:30000:MyVirtualMachine
+qemu-system-i386 --drive file=sheepdog://192.0.2.1:30000/MyVirtualMachine
@end example
See also @url{http://http://www.osrg.net/sheepdog/}.