From nobody Sun Apr 12 06:03:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1770813053; cv=none; d=zohomail.com; s=zohoarc; b=bFDPpiwj7jE+a+wKup1pJ+cDVcHF+NfaiqM9DZ+iYhHXGBzhyfFxZGC6t0sILrZnaPqM3XhChgA+FLJvrqNOqP9A+YG24SJQTWm816nnX6xM4RtEqt4oy/0ERpUMErPntR82G3Z5ylYwBK4E6vX0zEfgsige/FxnjLvsxUZPjQM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770813053; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=y3G7pz3JVMFqRvpJ05R+kBwpJ0ObSQg4ak0FyKLiTE8=; b=HfveCF+cMj6mRwjq/V+vj6phNsrpCYwsSC0iqtm+aNBKUCGfHWPMVTS+P7HIj+Oqw3kXqWYvqumsCejzP2nRw73Fqxiw3g7esABcPx+opCZb9kAFzKUvdkA05eYzLBZ2ExnlsLb0vDI05XChePXeOFiqo7Ns3kYQUAW4ayZNSoY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1770813053054718.3405242534423; Wed, 11 Feb 2026 04:30:53 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1227451.1533862 (Exim 4.92) (envelope-from ) id 1vq9Md-0002gf-C8; Wed, 11 Feb 2026 12:30:39 +0000 Received: by outflank-mailman (output) from mailman id 1227451.1533862; Wed, 11 Feb 2026 12:30:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vq9Md-0002gX-8R; Wed, 11 Feb 2026 12:30:39 +0000 Received: by outflank-mailman (input) for mailman id 1227451; Wed, 11 Feb 2026 12:30:37 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vq9Mb-00016c-U3 for xen-devel@lists.xenproject.org; Wed, 11 Feb 2026 12:30:37 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 76b4253e-0745-11f1-9ccf-f158ae23cfc8; Wed, 11 Feb 2026 13:30:36 +0100 (CET) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-480-CFV2PrjpPRWNUIY43HdbbQ-1; Wed, 11 Feb 2026 07:30:31 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A5ECE1800613; Wed, 11 Feb 2026 12:30:29 +0000 (UTC) Received: from localhost (unknown [10.45.242.6]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B359B19560A3; Wed, 11 Feb 2026 12:30:27 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 76b4253e-0745-11f1-9ccf-f158ae23cfc8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770813034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y3G7pz3JVMFqRvpJ05R+kBwpJ0ObSQg4ak0FyKLiTE8=; b=VvDhOnybq1ZVO7LCm/vinOPqPmTxt6NdMM58lr/hzBR8YzbXk1ikiUKtkbYGS7A09Deo66 gkzek2z33VU0y1uKu9+a+8Jj//hNylZxdB1V4KnxCBNMnLBNG3n4Vn1yADBSK0hx7rS2RC JqgpBUniIz8QCcaLM7Z7M0FZPQ8Iju4= X-MC-Unique: CFV2PrjpPRWNUIY43HdbbQ-1 X-Mimecast-MFC-AGG-ID: CFV2PrjpPRWNUIY43HdbbQ_1770813030 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Eduardo Habkost , xen-devel@lists.xenproject.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Edgar E. Iglesias" , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Eric Blake , Samuel Thibault , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Stabellini , Paul Durrant , Vladimir Sementsov-Ogievskiy Subject: [PULL 03/14] ui/spice: drop SPICE_HAS_ATTACHED_WORKER macro Date: Wed, 11 Feb 2026 16:29:50 +0400 Message-ID: <20260211123007.3569932-4-marcandre.lureau@redhat.com> In-Reply-To: <20260211123007.3569932-1-marcandre.lureau@redhat.com> References: <20260211123007.3569932-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-MFC-PROC-ID: -q37x9RyfgxChA-RHDLxik9_cW0YOs0SZRY4Sl8UhGs_1770813030 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1770813054436158501 From: Vladimir Sementsov-Ogievskiy Since previous commit it is always 1. Let's just drop it. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20260115144606.233252-3-vsementsov@yandex-team.ru> --- include/ui/qemu-spice.h | 2 -- hw/display/qxl.c | 12 ------------ ui/spice-display.c | 11 ----------- 3 files changed, 25 deletions(-) diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h index 8e5e6b2a744..111a09ceca3 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); =20 -#define SPICE_HAS_ATTACHED_WORKER 1 - #else /* CONFIG_SPICE */ =20 #include "qemu/error-report.h" diff --git a/hw/display/qxl.c b/hw/display/qxl.c index fbba02113f7..0551b38230b 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); } =20 -#if !(SPICE_HAS_ATTACHED_WORKER) -static void interface_attach_worker(QXLInstance *sin, QXLWorker *qxl_worke= r) -{ - interface_attached_worker(sin); -} -#endif - static void interface_set_compression_level(QXLInstance *sin, int level) { PCIQXLDevice *qxl =3D container_of(sin, PCIQXLDevice, ssd.qxl); @@ -1131,12 +1124,7 @@ static const QXLInterface qxl_interface =3D { .base.major_version =3D SPICE_INTERFACE_QXL_MAJOR, .base.minor_version =3D SPICE_INTERFACE_QXL_MINOR, =20 -#if SPICE_HAS_ATTACHED_WORKER .attached_worker =3D interface_attached_worker, -#else - .attache_worker =3D interface_attach_worker, -#endif - .set_compression_level =3D interface_set_compression_level, .get_init_info =3D interface_get_init_info, =20 diff --git a/ui/spice-display.c b/ui/spice-display.c index f2304bb0ce2..28399f8a817 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -507,17 +507,10 @@ void qemu_spice_display_refresh(SimpleSpiceDisplay *s= sd) =20 /* spice display interface callbacks */ =20 -#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_worke= r) -{ - /* nothing to do */ -} -#endif =20 static void interface_set_compression_level(QXLInstance *sin, int level) { @@ -707,11 +700,7 @@ static const QXLInterface dpy_interface =3D { .base.major_version =3D SPICE_INTERFACE_QXL_MAJOR, .base.minor_version =3D SPICE_INTERFACE_QXL_MINOR, =20 -#if SPICE_HAS_ATTACHED_WORKER .attached_worker =3D interface_attached_worker, -#else - .attache_worker =3D interface_attach_worker, -#endif .set_compression_level =3D interface_set_compression_level, .get_init_info =3D interface_get_init_info, =20 --=20 2.52.0