From c448e8552b0f6135dabddf944a7110f929c08320 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 11 Mar 2010 11:13:32 -0300
Subject: spice: tls support

Add options to the -spice command line switch to setup tls.
---
 qemu-config.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'qemu-config.c')

diff --git a/qemu-config.c b/qemu-config.c
index 32917cbda4..26748a5b7a 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -361,12 +361,36 @@ QemuOptsList qemu_spice_opts = {
         {
             .name = "port",
             .type = QEMU_OPT_NUMBER,
+        },{
+            .name = "tls-port",
+            .type = QEMU_OPT_NUMBER,
         },{
             .name = "password",
             .type = QEMU_OPT_STRING,
         },{
             .name = "disable-ticketing",
             .type = QEMU_OPT_BOOL,
+        },{
+            .name = "x509-dir",
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "x509-key-file",
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "x509-key-password",
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "x509-cert-file",
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "x509-cacert-file",
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "x509-dh-key-file",
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "tls-ciphers",
+            .type = QEMU_OPT_STRING,
         },
         { /* end if list */ }
     },
-- 
cgit v1.2.3


From 9f04e09e36e430dd57c69c88b0532e9dc5061a47 Mon Sep 17 00:00:00 2001
From: Yonit Halperin <yhalperi@redhat.com>
Date: Wed, 14 Jul 2010 13:26:34 +0300
Subject: spice: make compression configurable.

This patch adds options to the -spice command line switch to
configure image compression.

[ v2: speling fix in the documentation ]
---
 qemu-config.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'qemu-config.c')

diff --git a/qemu-config.c b/qemu-config.c
index 26748a5b7a..8b545b15f9 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -391,6 +391,15 @@ QemuOptsList qemu_spice_opts = {
         },{
             .name = "tls-ciphers",
             .type = QEMU_OPT_STRING,
+        },{
+            .name = "image-compression",
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "jpeg-wan-compression",
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "zlib-glz-wan-compression",
+            .type = QEMU_OPT_STRING,
         },
         { /* end if list */ }
     },
-- 
cgit v1.2.3


From 17b6dea08bd8c8484bc48dc67add236d2fe002b5 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Fri, 27 Aug 2010 14:09:56 +0200
Subject: spice: add config options for channel security.

This allows to enforce tls or plaintext usage for certain spice
channels.

[ v2: code style fixup ]
---
 qemu-config.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'qemu-config.c')

diff --git a/qemu-config.c b/qemu-config.c
index 8b545b15f9..f52e50c377 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -391,6 +391,12 @@ QemuOptsList qemu_spice_opts = {
         },{
             .name = "tls-ciphers",
             .type = QEMU_OPT_STRING,
+        },{
+            .name = "tls-channel",
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "plaintext-channel",
+            .type = QEMU_OPT_STRING,
         },{
             .name = "image-compression",
             .type = QEMU_OPT_STRING,
-- 
cgit v1.2.3


From 333b0eebcc8941b8453e837293eaa1191e967c25 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Fri, 27 Aug 2010 14:29:16 +0200
Subject: spice: add config options for the listening address

Make listening address configurable.  Also add options to
force using IPv4 or IPv6.
---
 qemu-config.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'qemu-config.c')

diff --git a/qemu-config.c b/qemu-config.c
index f52e50c377..5a62ae131d 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -364,6 +364,15 @@ QemuOptsList qemu_spice_opts = {
         },{
             .name = "tls-port",
             .type = QEMU_OPT_NUMBER,
+        },{
+            .name = "addr",
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "ipv4",
+            .type = QEMU_OPT_BOOL,
+        },{
+            .name = "ipv6",
+            .type = QEMU_OPT_BOOL,
         },{
             .name = "password",
             .type = QEMU_OPT_STRING,
-- 
cgit v1.2.3


From 84a23f251fe85768338434040257bb96cf555de8 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Mon, 30 Aug 2010 16:36:53 +0200
Subject: spice: add misc config options

This patch adds a few more options to tweak spice server behavior.
The documentation update chunk has the details ;)
---
 qemu-config.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'qemu-config.c')

diff --git a/qemu-config.c b/qemu-config.c
index 5a62ae131d..52f18bef31 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -415,6 +415,15 @@ QemuOptsList qemu_spice_opts = {
         },{
             .name = "zlib-glz-wan-compression",
             .type = QEMU_OPT_STRING,
+        },{
+            .name = "streaming-video",
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "agent-mouse",
+            .type = QEMU_OPT_BOOL,
+        },{
+            .name = "playback-compression",
+            .type = QEMU_OPT_BOOL,
         },
         { /* end if list */ }
     },
-- 
cgit v1.2.3