mirror of
https://github.com/qemu/qemu.git
synced 2026-07-08 17:46:10 +00:00
ui/spice: drop SPICE_HAS_ATTACHED_WORKER macro
Since previous commit it is always 1. Let's just drop it. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20260115144606.233252-3-vsementsov@yandex-team.ru>
This commit is contained in:
committed by
Marc-André Lureau
parent
bd5058cf08
commit
2a545fd851
@@ -530,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);
|
||||
@@ -1131,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,
|
||||
|
||||
|
||||
@@ -34,8 +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);
|
||||
|
||||
#define SPICE_HAS_ATTACHED_WORKER 1
|
||||
|
||||
#else /* CONFIG_SPICE */
|
||||
|
||||
#include "qemu/error-report.h"
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
@@ -707,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,
|
||||
|
||||
|
||||
Reference in New Issue
Block a user