diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-24 14:33:09 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-24 14:33:09 -0500 |
| commit | 9fbbf0d1b16a0e3e4132b187c2beba458964ea98 (patch) | |
| tree | 084af4af502603e1027253721af74b9b97506be5 /qemu-options.hx | |
| parent | 89f204d2c60fbf3e0c5af1ff1681e57c9f057178 (diff) | |
| parent | 5ad24e5f3b5968240d50fb2e5b6e19517b041052 (diff) | |
| download | qemu-9fbbf0d1b16a0e3e4132b187c2beba458964ea98.tar.gz | |
Merge remote-tracking branch 'spice/spice.v71' into staging
# By Gerd Hoffmann (1) and Hans de Goede (1)
# Via Gerd Hoffmann
* spice/spice.v71:
spice: Add -spice disable-agent-file-transfer cmdline option (rhbz#961850)
qxl: fix Coverity scan SIGN_EXTENSION error
Message-id: 1372060666-18182-1-git-send-email-kraxel@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 688040ef72..ca6fdf6134 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -917,8 +917,8 @@ DEF("spice", HAS_ARG, QEMU_OPTION_spice, " [,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" + " [,disable-agent-file-xfer][,agent-mouse=[on|off]]\n" + " [,playback-compression=[on|off]][,seamless-migration=[on|off]]\n" " enable spice\n" " at least one of {port, tls-port} is mandatory\n", QEMU_ARCH_ALL) @@ -961,6 +961,9 @@ Allow client connects without authentication. @item disable-copy-paste Disable copy paste between the client and the guest. +@item disable-agent-file-xfer +Disable spice-vdagent based file-xfer between the client and the guest. + @item tls-port=<nr> Set the TCP port spice is listening on for encrypted channels. |