Signed-off-by: Marc-André Lureau <[email protected]>
---
include/ui/qemu-spice.h | 6 ------
chardev/spice.c | 6 ------
hw/display/qxl.c | 23 ++---------------------
ui/spice-display.c | 15 ---------------
4 files changed, 2 insertions(+), 48 deletions(-)
diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index b7d493742c4..111a09ceca3 100644
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -34,12 +34,6 @@ int qemu_spice_add_display_interface(QXLInstance *qxlin,
QemuConsole *con);
int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,
const char *subject);
-#if SPICE_SERVER_VERSION >= 0x000f00 /* release 0.15.0 */
-#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/chardev/spice.c b/chardev/spice.c
index db53b49da26..39b79d60fb4 100644
--- a/chardev/spice.c
+++ b/chardev/spice.c
@@ -278,12 +278,6 @@ static void qemu_chr_open_spice_vmc(Chardev *chr,
}
*be_opened = false;
-#if SPICE_SERVER_VERSION < 0x000e02
- /* Spice < 0.14.2 doesn't explicitly open smartcard chardev */
- if (strcmp(type, "smartcard") == 0) {
- *be_opened = true;
- }
-#endif
chr_open(chr, type);
}
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index f29b736722c..0551b38230b 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -261,11 +261,6 @@ static void qxl_spice_monitors_config_async(PCIQXLDevice
*qxl, int replay)
QXL_COOKIE_TYPE_POST_LOAD_MONITORS_CONFIG,
0));
} else {
-#if SPICE_SERVER_VERSION < 0x000e02 /* release 0.14.2 */
- if (qxl->max_outputs) {
- spice_qxl_set_max_monitors(&qxl->ssd.qxl, qxl->max_outputs);
- }
-#endif
qxl->guest_monitors_config = qxl->ram->monitors_config;
spice_qxl_monitors_config_async(&qxl->ssd.qxl,
qxl->ram->monitors_config,
@@ -535,13 +530,6 @@ static void interface_attached_worker(QXLInstance *sin)
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);
@@ -1136,12 +1124,7 @@ 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,
.get_init_info = interface_get_init_info,
@@ -2109,6 +2092,8 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Error
**errp)
uint8_t* config = qxl->pci.config;
uint32_t pci_device_rev;
uint32_t io_size;
+ Error *err = NULL;
+ char device_address[256] = "";
qemu_spice_display_init_common(&qxl->ssd);
qxl->mode = QXL_MODE_UNDEFINED;
@@ -2208,9 +2193,6 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Error
**errp)
return;
}
-#if SPICE_SERVER_VERSION >= 0x000e02 /* release 0.14.2 */
- Error *err = NULL;
- char device_address[256] = "";
if (qemu_console_fill_device_address(qxl->vga.con,
device_address,
sizeof(device_address),
&err)) {
@@ -2221,7 +2203,6 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Error
**errp)
} else {
error_report_err(err);
}
-#endif
qemu_add_vm_change_state_handler(qxl_vm_change_state_handler, qxl);
diff --git a/ui/spice-display.c b/ui/spice-display.c
index db71e866f89..6b76b9dcecd 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -507,17 +507,10 @@ 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)
{
@@ -689,13 +682,11 @@ static int interface_client_monitors_config(QXLInstance
*sin,
if (mc->num_of_monitors > head) {
info.width = mc->monitors[head].width;
info.height = mc->monitors[head].height;
-#if SPICE_SERVER_VERSION >= 0x000e04 /* release 0.14.4 */
if (mc->flags & VD_AGENT_CONFIG_MONITORS_FLAG_PHYSICAL_SIZE) {
VDAgentMonitorMM *mm = (void *)&mc->monitors[mc->num_of_monitors];
info.width_mm = mm[head].width;
info.height_mm = mm[head].height;
}
-#endif
}
trace_qemu_spice_ui_info(ssd->qxl.id, info.width, info.height);
@@ -709,11 +700,7 @@ 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,
.get_init_info = interface_get_init_info,
@@ -1414,7 +1401,6 @@ static void qemu_spice_display_init_one(QemuConsole *con)
ssd->qxl.base.sif = &dpy_interface.base;
qemu_spice_add_display_interface(&ssd->qxl, con);
-#if SPICE_SERVER_VERSION >= 0x000e02 /* release 0.14.2 */
Error *err = NULL;
char device_address[256] = "";
if (qemu_console_fill_device_address(con, device_address, 256, &err)) {
@@ -1425,7 +1411,6 @@ static void qemu_spice_display_init_one(QemuConsole *con)
} else {
error_report_err(err);
}
-#endif
qemu_spice_create_host_memslot(ssd);
--
2.52.0
