Commit 012b80d3 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

spice: require spice 0.6.0 or newer. 



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: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 44bd6907

configure

+1 −1
Original line number Diff line number Diff line
@@ -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"

ui/spice-core.c

+0 −8
Original line number Diff line number Diff line
@@ -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);