[Qemu-devel] [PATCH 0/1] spice: avoid .set_mm_time on >= 0.12.6

[Qemu-devel] [PATCH 0/1] spice: avoid .set_mm_time on >= 0.12.6

[John Snow]

As near as I can tell, Spice 0.12.6 will make absolutely no use
of this callback, so my primitive understanding is that it should
be safe to just compile out on newer spice versions.

(Or at least, it will be functionally identical to what already
happens in practice on such compilations.)

The point, as always, is to test people's patience with me checking
in patches to make the Clang build happy on modern Linux distributions.
The .set_mm_time method was marked as DEPRECATED, so the famously picky
Clang compiler will error out now.

John Snow (1):
  spice: avoid .set_mm_time on >= 0.12.6

 hw/display/qxl.c        | 4 ++++
 include/ui/qemu-spice.h | 3 +++
 ui/spice-display.c      | 4 ++++
 3 files changed, 11 insertions(+)

-- 
2.5.5

[Qemu-devel] [PATCH 1/1] spice: avoid .set_mm_time on >= 0.12.6

[John Snow]

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 <jsnow@redhat.com>
---
 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 919dc5c..5b85376 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)
 {
@@ -1068,7 +1070,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 */
-- 
2.5.5