summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2011-03-27 16:43:54 +0200
committerHans de Goede <hdegoede@redhat.com>2011-05-02 17:01:27 +0200
commit586a84c6a7d3a98f16c670b7e08f0ca7777f9e12 (patch)
treee3ab9135a10f63f792cbdf48dcdfb680c5f527bc
parentd4319e03f867171b7af1aa5228540575bce543ae (diff)
spice: add option for disabling copy paste supportspice-patches
Some people want to be able disable spice's guest <-> client copy paste support because of security considerations.
-rw-r--r--qemu-config.c3
-rw-r--r--qemu-options.hx3
-rw-r--r--ui/spice-core.c9
3 files changed, 15 insertions, 0 deletions
diff --git a/qemu-config.c b/qemu-config.c
index 14d34194d0..6e7a13177b 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -385,6 +385,9 @@ QemuOptsList qemu_spice_opts = {
.name = "disable-ticketing",
.type = QEMU_OPT_BOOL,
},{
+ .name = "disable-copy-paste",
+ .type = QEMU_OPT_BOOL,
+ },{
.name = "x509-dir",
.type = QEMU_OPT_STRING,
},{
diff --git a/qemu-options.hx b/qemu-options.hx
index 489df10c46..4448ded218 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -715,6 +715,9 @@ Set the password you need to authenticate.
@item disable-ticketing
Allow client connects without authentication.
+@item disable-copy-paste
+Disable copy paste between the client and the guest.
+
@item tls-port=<nr>
Set the TCP port spice is listening on for encrypted channels.
diff --git a/ui/spice-core.c b/ui/spice-core.c
index ef56ed61a9..a21fabc482 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -554,6 +554,15 @@ void qemu_spice_init(void)
spice_server_set_noauth(spice_server);
}
+ if (qemu_opt_get_bool(opts, "disable-copy-paste", 0)) {
+#if SPICE_SERVER_VERSION >= 0x000801
+ spice_server_set_agent_copypaste(spice_server, 0);
+#else
+ fprintf(stderr, "spice: disable-copy-paste is only supported when compiled with spice-server >= 0.8.1\n");
+ exit(1);
+#endif
+ }
+
compression = SPICE_IMAGE_COMPRESS_AUTO_GLZ;
str = qemu_opt_get(opts, "image-compression");
if (str) {