[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/7] spice: require spice 0.6.0 or newer.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 6/7] spice: require spice 0.6.0 or newer. |
Date: |
Mon, 6 Jun 2011 14:49:39 +0200 |
This patch raises the minimum required spice version to 0.6.0 and drops
a few ifdefs.
0.6.0 is the first stable release with the current libspice-server API,
there shouldn't be any 0.5.x development versions deployed any more.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
configure | 2 +-
ui/spice-core.c | 8 --------
2 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/configure b/configure
index d38b952..11f85bf 100755
--- a/configure
+++ b/configure
@@ -2431,7 +2431,7 @@ int main(void) { spice_server_new(); return 0; }
EOF
spice_cflags=$($pkg_config --cflags spice-protocol spice-server 2>/dev/null)
spice_libs=$($pkg_config --libs spice-protocol spice-server 2>/dev/null)
- if $pkg_config --atleast-version=0.5.3 spice-server >/dev/null 2>&1 && \
+ if $pkg_config --atleast-version=0.6.0 spice-server >/dev/null 2>&1 && \
compile_prog "$spice_cflags" "$spice_libs" ; then
spice="yes"
libs_softmmu="$libs_softmmu $spice_libs"
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 457d34d..dd9905b 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -299,8 +299,6 @@ static int parse_name(const char *string, const char
*optname,
exit(1);
}
-#if SPICE_SERVER_VERSION >= 0x000600 /* 0.6.0 */
-
static const char *stream_video_names[] = {
[ SPICE_STREAM_VIDEO_OFF ] = "off",
[ SPICE_STREAM_VIDEO_ALL ] = "all",
@@ -309,8 +307,6 @@ static const char *stream_video_names[] = {
#define parse_stream_video(_name) \
name2enum(_name, stream_video_names, ARRAY_SIZE(stream_video_names))
-#endif /* >= 0.6.0 */
-
static const char *compression_names[] = {
[ SPICE_IMAGE_COMPRESS_OFF ] = "off",
[ SPICE_IMAGE_COMPRESS_AUTO_GLZ ] = "auto_glz",
@@ -593,8 +589,6 @@ void qemu_spice_init(void)
}
spice_server_set_zlib_glz_compression(spice_server, wan_compr);
-#if SPICE_SERVER_VERSION >= 0x000600 /* 0.6.0 */
-
str = qemu_opt_get(opts, "streaming-video");
if (str) {
int streaming_video = parse_stream_video(str);
@@ -606,8 +600,6 @@ void qemu_spice_init(void)
spice_server_set_playback_compression
(spice_server, qemu_opt_get_bool(opts, "playback-compression", 1));
-#endif /* >= 0.6.0 */
-
qemu_opt_foreach(opts, add_channel, NULL, 0);
spice_server_init(spice_server, &core_interface);
--
1.7.1
- [Qemu-devel] [PULL] spice patch queue, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 2/7] spice: add option for disabling copy paste support, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 3/7] qxl: add to the list of devices which disable the default vga, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 1/7] spice-qemu-char: Fix flow control in client -> guest direction, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 5/7] qemu-config: comment spell fix, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 7/7] qxl: fix cmdlog for vga, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 6/7] spice: require spice 0.6.0 or newer.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 4/7] spice: add SASL support, Gerd Hoffmann, 2011/06/06
- Re: [Qemu-devel] [PULL] spice patch queue, Anthony Liguori, 2011/06/09
- Re: [Qemu-devel] [PULL] spice patch queue, Anthony Liguori, 2011/06/09