[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/9] spice: avoid .set_mm_time on >= 0.12.6
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 6/9] spice: avoid .set_mm_time on >= 0.12.6 |
Date: |
Wed, 6 Jul 2016 12:04:39 +0200 |
From: John Snow <address@hidden>
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: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/display/qxl.c | 4 ++++
include/ui/qemu-spice.h | 3 +++
ui/spice-display.c | 4 ++++
3 files changed, 11 insertions(+)
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 65a3653..46cc866 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -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 */
diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index 57ac91b..edad5e7 100644
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -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
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 34095fb..8644a73 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -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 */
--
1.8.3.1
- [Qemu-devel] [PULL 0/9] spice and qxl bugfixes, Gerd Hoffmann, 2016/07/06
- [Qemu-devel] [PULL 1/9] qxl: use uint64_t for vram size, Gerd Hoffmann, 2016/07/06
- [Qemu-devel] [PULL 6/9] spice: avoid .set_mm_time on >= 0.12.6,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 7/9] virgl: count the calls to gl_block, Gerd Hoffmann, 2016/07/06
- [Qemu-devel] [PULL 4/9] qxl: store memory region and offset instead of pointer for guest slots, Gerd Hoffmann, 2016/07/06
- [Qemu-devel] [PULL 3/9] qxl: factor out qxl_get_check_slot_offset, Gerd Hoffmann, 2016/07/06
- [Qemu-devel] [PULL 2/9] qxl: handle no updates in interface_update_area_complete, Gerd Hoffmann, 2016/07/06
- [Qemu-devel] [PULL 8/9] spice: use the right head for multi-monitor, Gerd Hoffmann, 2016/07/06
- [Qemu-devel] [PULL 9/9] virgl: pass whole GL scanout dimensions, Gerd Hoffmann, 2016/07/06
- [Qemu-devel] [PULL 5/9] qxl: fix surface migration, Gerd Hoffmann, 2016/07/06
- Re: [Qemu-devel] [PULL 0/9] spice and qxl bugfixes, Peter Maydell, 2016/07/06