spice patch queue
Hi,
Tiny spice patch queue with only two patches, one adding a spice cmd line option and one bugfix.
please pull,
Gerd
The following changes since commit 576156ffed72ab4feb0b752979db86ff8759a2a1:
Merge remote-tracking branch 'bonzini/iommu-for-anthony' into staging (2013-06-20 16:53:39 -0500)
are available in the git repository at:
git://anongit.freedesktop.org/spice/qemu spice.v71
for you to fetch changes up to 5ad24e5f3b5968240d50fb2e5b6e19517b041052:
spice: Add -spice disable-agent-file-transfer cmdline option (rhbz#961850) (2013-06-24 08:23:09 +0200)
----------------------------------------------------------------
Gerd Hoffmann (1):
qxl: fix Coverity scan SIGN_EXTENSION error
Hans de Goede (1):
spice: Add -spice disable-agent-file-transfer cmdline option (rhbz#961850)
hw/display/qxl-render.c | 2 +- qemu-options.hx | 7 +++++-- ui/spice-core.c | 13 +++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-)
PATCH 1/2 qxl: fix Coverity scan SIGN_EXTENSION error
--- hw/display/qxl-render.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/display/qxl-render.c +1 -1
@@ -199,7 +199,7 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor) c->hot_y = cursor->header.hot_spot_y;switch (cursor->header.type) {case SPICE_CURSOR_TYPE_ALPHA : - size = cursor->header.width * cursor->header.height *sizeof (uint32_t ); + size =sizeof (uint32_t ) * cursor->header.width * cursor->header.height;memcpy (c->data, cursor->chunk.data, size);if (qxl->debug >2 ) {cursor_print_ascii_art (c,"qxl/alpha" );
Signature · 1 line
1.7.9.7
PATCH 2/2 spice: Add -spice disable-agent-file-transfer cmdline option (rhbz#961850)
In reply to Gerd HoffmannFrom: Hans de Goede <[email protected]>
--- qemu-options.hx | 7 +++++-- ui/spice-core.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-)
qemu-options.hx +5 -2
@@ -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.
ui/spice-core.c +13 -0
@@ -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) {
Signature · 1 line
1.7.9.7