From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur1ep-0007yh-3O for qemu-devel@nongnu.org; Mon, 24 Jun 2013 03:57:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ur1en-0007Dh-Jc for qemu-devel@nongnu.org; Mon, 24 Jun 2013 03:57:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7968) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur1en-0007DK-AG for qemu-devel@nongnu.org; Mon, 24 Jun 2013 03:57:49 -0400 From: Gerd Hoffmann Date: Mon, 24 Jun 2013 09:57:46 +0200 Message-Id: <1372060666-18182-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1372060666-18182-1-git-send-email-kraxel@redhat.com> References: <1372060666-18182-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] spice: Add -spice disable-agent-file-transfer cmdline option (rhbz#961850) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Hans de Goede , Anthony Liguori , Gerd Hoffmann From: Hans de Goede Signed-off-by: Hans de Goede Signed-off-by: Gerd Hoffmann --- qemu-options.hx | 7 +++++-- ui/spice-core.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 8355f9b..c1533a3 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= Set the TCP port spice is listening on for encrypted channels. diff --git a/ui/spice-core.c b/ui/spice-core.c index bcc4199..f308fd9 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) { -- 1.7.9.7