aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2010-10-18 15:50:57 -0200
committerMarcelo Tosatti <mtosatti@redhat.com>2010-10-18 15:50:57 -0200
commit9d5b3ab9fdad6d53af301c5fccf0a7201f961ee0 (patch)
treeaabf3a23997e130f81339ee703c090aea081457c /qemu-options.hx
parentMerge commit '54dd932128ae08d6a5a6668551508e30520b0f86' into upstream-merge (diff)
parentissue snd_pcm_start() when capturing audio (diff)
downloadqemu-kvm-9d5b3ab9fdad6d53af301c5fccf0a7201f961ee0.tar.gz
qemu-kvm-9d5b3ab9fdad6d53af301c5fccf0a7201f961ee0.tar.bz2
qemu-kvm-9d5b3ab9fdad6d53af301c5fccf0a7201f961ee0.zip
Merge commit '38cc9b607f85017b095793cab6c129bc9844f441' into upstream-merge
* commit '38cc9b607f85017b095793cab6c129bc9844f441': (44 commits) issue snd_pcm_start() when capturing audio fix 100% CPU load when idle with ALSA trace: print a warning if user tries to enable an unknown trace event mips: avoid write only variables ppc: avoid write only variables i386: avoid a write only variable vnc: avoid write only variables cris: avoid a write only variable Delete write only variables ppc: remove video.x lsi53c895a: avoid a write only variable eepro100: initialize a variable in all cases cirrus: avoid write only variables block: avoid a write only variable trace: remove timestamp files when cleaning up configure: Send error message from spice check to /dev/null win32: Set unbuffered stdout .gitignore: Ignore *-timestamp acpi: Fix an infinite loop in acpi_table_add configure: Remove unneeded defines from checks ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.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 5e5676a04..1c9a1e575 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -672,6 +672,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)