Commit 015e02f8 authored by John Snow's avatar John Snow Committed by Gerd Hoffmann
Browse files

spice: avoid .set_mm_time on >= 0.12.6 



Spice deprecated this callback in 0.12.6.
It's not a problem yet, but it will cause Clang to fail in a -Werror
build due to the deprecated tag.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Message-id: 1467240095-12507-2-git-send-email-jsnow@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 1331eab2

hw/display/qxl.c

+4 −0
Original line number Diff line number Diff line
@@ -504,6 +504,7 @@ static void interface_set_compression_level(QXLInstance *sin, int level) 
    qxl_rom_set_dirty(qxl);

}



#if SPICE_NEEDS_SET_MM_TIME

static void interface_set_mm_time(QXLInstance *sin, uint32_t mm_time)

{

    PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
@@ -517,6 +518,7 @@ static void interface_set_mm_time(QXLInstance *sin, uint32_t mm_time) 
    qxl->rom->mm_clock = cpu_to_le32(mm_time);

    qxl_rom_set_dirty(qxl);

}

#endif



static void interface_get_init_info(QXLInstance *sin, QXLDevInitInfo *info)

{
@@ -1069,7 +1071,9 @@ static const QXLInterface qxl_interface = { 


    .attache_worker          = interface_attach_worker,

    .set_compression_level   = interface_set_compression_level,

#if SPICE_NEEDS_SET_MM_TIME

    .set_mm_time             = interface_set_mm_time,

#endif

    .get_init_info           = interface_get_init_info,



    /* the callbacks below are called from spice server thread context */

include/ui/qemu-spice.h

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ int qemu_spice_set_pw_expire(time_t expires); 
int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,

                            const char *subject);



#define SPICE_NEEDS_SET_MM_TIME                                       \

  (!defined(SPICE_SERVER_VERSION) || (SPICE_SERVER_VERSION < 0xc06))



#if SPICE_SERVER_VERSION >= 0x000c02

void qemu_spice_register_ports(void);

#else

ui/spice-display.c

+4 −0
Original line number Diff line number Diff line
@@ -527,11 +527,13 @@ static void interface_set_compression_level(QXLInstance *sin, int level) 
    /* nothing to do */

}



#if SPICE_NEEDS_SET_MM_TIME

static void interface_set_mm_time(QXLInstance *sin, uint32_t mm_time)

{

    dprint(3, "%s/%d:\n", __func__, sin->id);

    /* nothing to do */

}

#endif



static void interface_get_init_info(QXLInstance *sin, QXLDevInitInfo *info)

{
@@ -718,7 +720,9 @@ static const QXLInterface dpy_interface = { 


    .attache_worker          = interface_attach_worker,

    .set_compression_level   = interface_set_compression_level,

#if SPICE_NEEDS_SET_MM_TIME

    .set_mm_time             = interface_set_mm_time,

#endif

    .get_init_info           = interface_get_init_info,



    /* the callbacks below are called from spice server thread context */