Sorry, I forgot to patch the command-line help. Hope it helps.
El Viernes, 23 de enero de 2015 09:25:38 Eric Blake escribió:
> On 01/23/2015 07:06 AM, Javier Celaya wrote:
> > Hello, this is the patch with the version check. Christophe, can you check
> > that the version is the correct one?
> >
> >
> >
> > Recently, SPICE included the lz4 compression algorithm. This patch adds
> > a command line option to select it.
> > ---
> >
> > ui/spice-core.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/ui/spice-core.c b/ui/spice-core.c
> > index 6467fa4..dadcae9 100644
> > --- a/ui/spice-core.c
> > +++ b/ui/spice-core.c
> > @@ -359,6 +359,9 @@ static const char *compression_names[] = {
> >
> > [ SPICE_IMAGE_COMPRESS_QUIC ] = "quic",
> > [ SPICE_IMAGE_COMPRESS_GLZ ] = "glz",
> > [ SPICE_IMAGE_COMPRESS_LZ ] = "lz",
> >
> > +#if SPICE_SERVER_VERSION >= 0x000c07
> > + [ SPICE_IMAGE_COMPRESS_LZ4 ] = "lz4",
>
> How is libvirt going to introspect whether the command line supports
> this option? Is there some QMP command that lists the set of valid
> compression formats understood by a given qemu binary?
>From 26864da931603791c70c570b9b46f21657ebcaec Mon Sep 17 00:00:00 2001
From: Javier Celaya <javier.celaya@xxxxxxxxx>
Date: Wed, 7 Jan 2015 11:53:24 +0100
Subject: [PATCH] Add lz4 compression option for SPICE.
Recently, SPICE included the lz4 compression algorithm. This patch adds
a command line option to select it.
---
qemu-options.hx | 4 ++--
ui/spice-core.c | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index 22cf3b9..f5c54ba 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -953,7 +953,7 @@ DEF("spice", HAS_ARG, QEMU_OPTION_spice,
" [,tls-channel=[main|display|cursor|inputs|record|playback]]\n"
" [,plaintext-channel=[main|display|cursor|inputs|record|playback]]\n"
" [,sasl][,password=<secret>][,disable-ticketing]\n"
- " [,image-compression=[auto_glz|auto_lz|quic|glz|lz|off]]\n"
+ " [,image-compression=[auto_glz|auto_lz|quic|glz|lz|lz4|off]]\n"
" [,jpeg-wan-compression=[auto|never|always]]\n"
" [,zlib-glz-wan-compression=[auto|never|always]]\n"
" [,streaming-video=[off|all|filter]][,disable-copy-paste]\n"
@@ -1028,7 +1028,7 @@ channels. The special name "default" can be used to set the default
mode. For channels which are not explicitly forced into one mode the
spice client is allowed to pick tls/plaintext as he pleases.
-@item image-compression=[auto_glz|auto_lz|quic|glz|lz|off]
+@item image-compression=[auto_glz|auto_lz|quic|glz|lz|lz4|off]
Configure image compression (lossless).
Default is auto_glz.
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 6467fa4..dadcae9 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -359,6 +359,9 @@ static const char *compression_names[] = {
[ SPICE_IMAGE_COMPRESS_QUIC ] = "quic",
[ SPICE_IMAGE_COMPRESS_GLZ ] = "glz",
[ SPICE_IMAGE_COMPRESS_LZ ] = "lz",
+#if SPICE_SERVER_VERSION >= 0x000c07
+ [ SPICE_IMAGE_COMPRESS_LZ4 ] = "lz4",
+#endif
};
#define parse_compression(_name) \
parse_name(_name, "image compression", \
--
1.9.3
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel