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 /ui | |
| parent | 89f204d2c60fbf3e0c5af1ff1681e57c9f057178 (diff) | |
| parent | 5ad24e5f3b5968240d50fb2e5b6e19517b041052 (diff) | |
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 'ui')
| -rw-r--r-- | ui/spice-core.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c index bcc4199e7a..f308fd9d5e 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -446,6 +446,9 @@ static QemuOptsList qemu_spice_opts = { .name = "disable-copy-paste", .type = QEMU_OPT_BOOL, },{ + .name = "disable-agent-file-xfer", + .type = QEMU_OPT_BOOL, + },{ .name = "sasl", .type = QEMU_OPT_BOOL, },{ @@ -739,6 +742,16 @@ void qemu_spice_init(void) spice_server_set_agent_copypaste(spice_server, false); } + if (qemu_opt_get_bool(opts, "disable-agent-file-xfer", 0)) { +#if SPICE_SERVER_VERSION >= 0x000c04 + spice_server_set_agent_file_xfer(spice_server, false); +#else + error_report("this qemu build does not support the " + "\"disable-agent-file-xfer\" option"); + exit(1); +#endif + } + compression = SPICE_IMAGE_COMPRESS_AUTO_GLZ; str = qemu_opt_get(opts, "image-compression"); if (str) { |