[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 02/18] spice: Update QXLInterface for spice >= 0.15.0
From: |
Daniel P . Berrangé |
Subject: |
[PATCH v5 02/18] spice: Update QXLInterface for spice >= 0.15.0 |
Date: |
Wed, 15 Dec 2021 14:19:33 +0000 |
From: John Snow <jsnow@redhat.com>
spice updated the spelling (and arguments) of "attache_worker" in
0.15.0. Update QEMU to match, preventing -Wdeprecated-declarations
compilations from reporting build errors.
See also:
https://gitlab.freedesktop.org/spice/spice/-/commit/974692bda1e77af92b71ed43b022439448492cb9
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
hw/display/qxl.c | 14 +++++++++++++-
include/ui/qemu-spice.h | 6 ++++++
ui/spice-display.c | 11 +++++++++++
3 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 29c80b4289..1da6703e44 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -517,13 +517,20 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct
QXLCommandExt *ext)
/* spice display interface callbacks */
-static void interface_attach_worker(QXLInstance *sin, QXLWorker *qxl_worker)
+static void interface_attached_worker(QXLInstance *sin)
{
PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
trace_qxl_interface_attach_worker(qxl->id);
}
+#if !(SPICE_HAS_ATTACHED_WORKER)
+static void interface_attach_worker(QXLInstance *sin, QXLWorker *qxl_worker)
+{
+ interface_attached_worker(sin);
+}
+#endif
+
static void interface_set_compression_level(QXLInstance *sin, int level)
{
PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
@@ -1131,7 +1138,12 @@ static const QXLInterface qxl_interface = {
.base.major_version = SPICE_INTERFACE_QXL_MAJOR,
.base.minor_version = SPICE_INTERFACE_QXL_MINOR,
+#if SPICE_HAS_ATTACHED_WORKER
+ .attached_worker = interface_attached_worker,
+#else
.attache_worker = interface_attach_worker,
+#endif
+
.set_compression_level = interface_set_compression_level,
#if SPICE_NEEDS_SET_MM_TIME
.set_mm_time = interface_set_mm_time,
diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index 71ecd6cfd1..21fe195e18 100644
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -40,6 +40,12 @@ int qemu_spice_migrate_info(const char *hostname, int port,
int tls_port,
#define SPICE_NEEDS_SET_MM_TIME 0
#endif
+#if defined(SPICE_SERVER_VERSION) && (SPICE_SERVER_VERSION >= 0x000f00)
+#define SPICE_HAS_ATTACHED_WORKER 1
+#else
+#define SPICE_HAS_ATTACHED_WORKER 0
+#endif
+
#else /* CONFIG_SPICE */
#include "qemu/error-report.h"
diff --git a/ui/spice-display.c b/ui/spice-display.c
index f59c69882d..1a60cebb7d 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -500,10 +500,17 @@ void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd)
/* spice display interface callbacks */
+#if SPICE_HAS_ATTACHED_WORKER
+static void interface_attached_worker(QXLInstance *sin)
+{
+ /* nothing to do */
+}
+#else
static void interface_attach_worker(QXLInstance *sin, QXLWorker *qxl_worker)
{
/* nothing to do */
}
+#endif
static void interface_set_compression_level(QXLInstance *sin, int level)
{
@@ -702,7 +709,11 @@ static const QXLInterface dpy_interface = {
.base.major_version = SPICE_INTERFACE_QXL_MAJOR,
.base.minor_version = SPICE_INTERFACE_QXL_MINOR,
+#if SPICE_HAS_ATTACHED_WORKER
+ .attached_worker = interface_attached_worker,
+#else
.attache_worker = interface_attach_worker,
+#endif
.set_compression_level = interface_set_compression_level,
#if SPICE_NEEDS_SET_MM_TIME
.set_mm_time = interface_set_mm_time,
--
2.33.1
- [PATCH v5 00/18] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles, Daniel P . Berrangé, 2021/12/15
- [PATCH v5 03/18] meson: require liburing >= 0.3, Daniel P . Berrangé, 2021/12/15
- [PATCH v5 01/18] ui: avoid compiler warnings from unused clipboard info variable, Daniel P . Berrangé, 2021/12/15
- [PATCH v5 02/18] spice: Update QXLInterface for spice >= 0.15.0,
Daniel P . Berrangé <=
- [PATCH v5 08/18] tests/docker: auto-generate centos8.docker with lcitool, Daniel P . Berrangé, 2021/12/15
- [PATCH v5 09/18] tests/docker: auto-generate fedora.docker with lcitool, Daniel P . Berrangé, 2021/12/15
- [PATCH v5 07/18] tests: integrate lcitool for generating build env manifests, Daniel P . Berrangé, 2021/12/15
- [PATCH v5 10/18] tests/docker: auto-generate ubuntu1804.docker with lcitool, Daniel P . Berrangé, 2021/12/15
- [PATCH v5 05/18] ci: explicitly skip I/O tests on alpine, Daniel P . Berrangé, 2021/12/15
- [PATCH v5 12/18] tests/docker: auto-generate opensuse-leap.docker with lcitool, Daniel P . Berrangé, 2021/12/15
- [PATCH v5 04/18] ui: avoid warnings about directdb on Alpine / musl libc, Daniel P . Berrangé, 2021/12/15
- [PATCH v5 11/18] tests/docker: auto-generate ubuntu2004.docker with lcitool, Daniel P . Berrangé, 2021/12/15
- [PATCH v5 06/18] tests/docker: switch fedora image to release 35, Daniel P . Berrangé, 2021/12/15
- [PATCH v5 13/18] tests/docker: remove ubuntu.docker container, Daniel P . Berrangé, 2021/12/15