aboutsummaryrefslogtreecommitdiff
path: root/qemu-options.hx
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2010-10-05 14:14:19 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2010-10-05 14:14:19 -0500
commit4447d609688e75a40a10b559e3b6ae83843e3095 (patch)
tree94e721b263ae28e68e8f1ccd1aa7db401c8b7129 /qemu-options.hx
parent48f57044e6a826329ebcac5d5a76d776a14e5d43 (diff)
parent869564a9c0f78b1972e1ac51e69cb2016af3b060 (diff)
Merge remote branch 'spice/submit.6' into staging
Conflicts: configure Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-options.hx')
-rw-r--r--qemu-options.hx21
1 files changed, 21 insertions, 0 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index a0b5ae9bf1..718d47a2a3 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -670,6 +670,27 @@ STEXI
Enable SDL.
ETEXI
+DEF("spice", HAS_ARG, QEMU_OPTION_spice,
+ "-spice <args> enable spice\n", QEMU_ARCH_ALL)
+STEXI
+@item -spice @var{option}[,@var{option}[,...]]
+@findex -spice
+Enable the spice remote desktop protocol. Valid options are
+
+@table @option
+
+@item port=<nr>
+Set the TCP port spice is listening on.
+
+@item password=<secret>
+Set the password you need to authenticate.
+
+@item disable-ticketing
+Allow client connects without authentication.
+
+@end table
+ETEXI
+
DEF("portrait", 0, QEMU_OPTION_portrait,
"-portrait rotate graphical output 90 deg left (only PXA LCD)\n",
QEMU_ARCH_ALL)