|
 |
a81953e |
From 0045574847883167f5c2b569811e049616ee611d Mon Sep 17 00:00:00 2001
|
|
|
a81953e |
From: Yonit Halperin <yhalperi@redhat.com>
|
|
|
a81953e |
Date: Wed, 14 Jul 2010 13:26:34 +0300
|
|
|
a81953e |
Subject: [PATCH 26/39] spice: enabling/disabling jpeg and zlib-over-glz via spice command line args
|
|
|
a81953e |
|
|
|
a81953e |
---
|
|
|
a81953e |
qemu-config.c | 6 ++++++
|
|
|
a81953e |
spice.c | 29 +++++++++++++++++++++++++++++
|
|
|
a81953e |
2 files changed, 35 insertions(+), 0 deletions(-)
|
|
|
a81953e |
|
|
|
a81953e |
diff --git a/qemu-config.c b/qemu-config.c
|
|
|
a81953e |
index 74bfc62..3e4fcf9 100644
|
|
|
a81953e |
--- a/qemu-config.c
|
|
|
a81953e |
+++ b/qemu-config.c
|
|
|
a81953e |
@@ -384,6 +384,12 @@ QemuOptsList qemu_spice_opts = {
|
|
|
a81953e |
},{
|
|
|
a81953e |
.name = "tls-ciphers",
|
|
|
a81953e |
.type = QEMU_OPT_STRING,
|
|
|
a81953e |
+ },{
|
|
|
a81953e |
+ .name = "jpeg",
|
|
|
a81953e |
+ .type = QEMU_OPT_STRING,
|
|
|
a81953e |
+ },{
|
|
|
a81953e |
+ .name = "zlib-glz",
|
|
|
a81953e |
+ .type = QEMU_OPT_STRING,
|
|
|
a81953e |
},
|
|
|
a81953e |
{ /* end if list */ }
|
|
|
a81953e |
},
|
|
|
a81953e |
diff --git a/spice.c b/spice.c
|
|
|
a81953e |
index 1109b4f..201e53c 100644
|
|
|
a81953e |
--- a/spice.c
|
|
|
a81953e |
+++ b/spice.c
|
|
|
a81953e |
@@ -207,6 +207,23 @@ int mon_spice_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
|
|
|
a81953e |
port, tls_port, subject);
|
|
|
a81953e |
}
|
|
|
a81953e |
|
|
|
a81953e |
+static inline spice_wan_compression_t get_wan_compression_value(const char *str)
|
|
|
a81953e |
+{
|
|
|
a81953e |
+ if (!strcmp(str, "wan")) {
|
|
|
a81953e |
+ return SPICE_WAN_COMPRESSION_AUTO;
|
|
|
a81953e |
+ }
|
|
|
a81953e |
+
|
|
|
a81953e |
+ if (!strcmp(str, "never")) {
|
|
|
a81953e |
+ return SPICE_WAN_COMPRESSION_NEVER;
|
|
|
a81953e |
+ }
|
|
|
a81953e |
+
|
|
|
a81953e |
+ if (!strcmp(str, "always")) {
|
|
|
a81953e |
+ return SPICE_WAN_COMPRESSION_ALWAYS;
|
|
|
a81953e |
+ }
|
|
|
a81953e |
+
|
|
|
a81953e |
+ return SPICE_WAN_COMPRESSION_INVALID;
|
|
|
a81953e |
+}
|
|
|
a81953e |
+
|
|
|
a81953e |
void qemu_spice_init(void)
|
|
|
a81953e |
{
|
|
|
a81953e |
QemuOpts *opts = QTAILQ_FIRST(&qemu_spice_opts.head);
|
|
|
a81953e |
@@ -218,6 +235,7 @@ void qemu_spice_init(void)
|
|
|
a81953e |
*x509_cert_file = NULL,
|
|
|
a81953e |
*x509_cacert_file = NULL;
|
|
|
a81953e |
int port, tls_port, len;
|
|
|
a81953e |
+ const char *jpeg, *zlib_glz;
|
|
|
a81953e |
|
|
|
a81953e |
if (!opts)
|
|
|
a81953e |
return;
|
|
|
a81953e |
@@ -283,6 +301,17 @@ void qemu_spice_init(void)
|
|
|
a81953e |
/* TODO: make configurable via cmdline */
|
|
|
a81953e |
spice_server_set_image_compression(spice_server, SPICE_IMAGE_COMPRESS_AUTO_GLZ);
|
|
|
a81953e |
|
|
|
a81953e |
+ jpeg = qemu_opt_get(opts, "jpeg");
|
|
|
a81953e |
+ zlib_glz = qemu_opt_get(opts, "zlib-glz");
|
|
|
a81953e |
+
|
|
|
a81953e |
+ if (jpeg) {
|
|
|
a81953e |
+ spice_server_set_jpeg_compression(spice_server, get_wan_compression_value(jpeg));
|
|
|
a81953e |
+ }
|
|
|
a81953e |
+
|
|
|
a81953e |
+ if (zlib_glz) {
|
|
|
a81953e |
+ spice_server_set_zlib_glz_compression(spice_server, get_wan_compression_value(zlib_glz));
|
|
|
a81953e |
+ }
|
|
|
a81953e |
+
|
|
|
a81953e |
spice_server_init(spice_server, &core_interface);
|
|
|
a81953e |
using_spice = 1;
|
|
|
a81953e |
|
|
|
a81953e |
--
|
|
|
a81953e |
1.7.2.3
|
|
|
a81953e |
|