Hi On Thu, Dec 4, 2025 at 7:42 PM Vladimir Sementsov-Ogievskiy < [email protected]> wrote:
> Since previous commit it is always 1. Let's just drop it. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <[email protected]> > Reviewed-by: Marc-André Lureau <[email protected]> > --- > hw/display/qxl.c | 12 ------------ > include/ui/qemu-spice.h | 2 -- > ui/spice-display.c | 11 ----------- > 3 files changed, 25 deletions(-) > > diff --git a/hw/display/qxl.c b/hw/display/qxl.c > index 0fa8a3204d..a06395fb8a 100644 > --- a/hw/display/qxl.c > +++ b/hw/display/qxl.c > @@ -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, > > diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h > index 8e5e6b2a74..111a09ceca 100644 > --- a/include/ui/qemu-spice.h > +++ b/include/ui/qemu-spice.h > @@ -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" > diff --git a/ui/spice-display.c b/ui/spice-display.c > index f2304bb0ce..28399f8a81 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) > { > @@ -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, > > -- > 2.48.1 > >
