From 589cb6a669e11e1ce4b077e8ba0fbb9fc8d5bd40 Mon Sep 17 00:00:00 2001

From: Yonit Halperin <yhalperi@redhat.com>

Date: Tue, 21 Aug 2012 13:54:20 +0300

Subject: [PATCH] spice: increase the verbosity of spice section in "qemu

 --help"

Added all spice options to the help string. This can be used by libvirt

to determine which spice related features are supported by qemu.

Signed-off-by: Yonit Halperin <yhalperi@redhat.com>

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

(cherry picked from commit 27af778828db9aa893fa1de928744141e5de20e5)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

---

 qemu-options.hx | 18 +++++++++++++++++-

 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/qemu-options.hx b/qemu-options.hx

index dd7aa63..1af4fec 100644

--- a/qemu-options.hx

+++ b/qemu-options.hx

@@ -838,7 +838,23 @@ Enable SDL.

 ETEXI

 DEF("spice", HAS_ARG, QEMU_OPTION_spice,

-    "-spice <args>   enable spice\n", QEMU_ARCH_ALL)

+    "-spice [port=port][,tls-port=secured-port][,x509-dir=<dir>]\n"

+    "       [,x509-key-file=<file>][,x509-key-password=<file>]\n"

+    "       [,x509-cert-file=<file>][,x509-cacert-file=<file>]\n"

+    "       [,x509-dh-key-file=<file>][,addr=addr][,ipv4|ipv6]\n"

+    "       [,tls-ciphers=<list>]\n"

+    "       [,tls-channel=[main|display|cursor|inputs|record|playback]]\n"

+    "       [,plaintext-channel=[main|display|cursor|inputs|record|playback]]\n"

+    "       [,sasl][,password=<secret>][,disable-ticketing]\n"

+    "       [,image-compression=[auto_glz|auto_lz|quic|glz|lz|off]]\n"

+    "       [,jpeg-wan-compression=[auto|never|always]]\n"

+    "       [,zlib-glz-wan-compression=[auto|never|always]]\n"

+    "       [,streaming-video=[off|all|filter]][,disable-copy-paste]\n"

+    "       [,agent-mouse=[on|off]][,playback-compression=[on|off]]\n"

+    "       [,seamless-migration=[on|off]]\n"

+    "   enable spice\n"

+    "   at least one of {port, tls-port} is mandatory\n",

+    QEMU_ARCH_ALL)

 STEXI

 @item -spice @var{option}[,@var{option}[,...]]

 @findex -spice

-- 

1.7.12.1