From nobody Sun Apr 12 05:58:00 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1770804192; cv=none; d=zohomail.com; s=zohoarc; b=GO27mh7qZpBqnI4g8dLk4EOwfSKhkBSFVqIelsrbF5NPvUA+eMdrv/SjNjoJiPqcmkJ78BVshZjw76+N3CrpiXeRnRSne0rPGDwOwCoidK53vcv5IvQjPHZdHQ90IxxzHhHovfNOoHOR7TkmyNqFIbSDbAkt1kfE3sRtXxWQVOE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770804192; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5XFLgcgIJf4ihDQXzUgzIhmbnKsdK8VFUYV10YosG7M=; b=fk1OnUxq9H6zDkSb1zTx1MVE5BZL08a4RBTewUL8ZRPys43340Hqud3OAz+PjPjoR34gh7/qSbcCORxMYmXJ/GfkyxFKoP33BA9X/LjU/hRxLrkKgB7JqdoEjD/qrV8Foll05i8xzONkOVLv3oeflmNAsSxmiLWlkSZYEZ2kPzo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770804192086117.16831517673734; Wed, 11 Feb 2026 02:03:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vq73e-0001xs-5t; Wed, 11 Feb 2026 05:02:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vq73c-0001v3-Bs for qemu-devel@nongnu.org; Wed, 11 Feb 2026 05:02:52 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vq73a-0002zy-DD for qemu-devel@nongnu.org; Wed, 11 Feb 2026 05:02:52 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-20-QTMDxZAhNsGxjWG0IwCrrw-1; Wed, 11 Feb 2026 05:02:46 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5659E1956052; Wed, 11 Feb 2026 10:02:45 +0000 (UTC) Received: from localhost (unknown [10.45.242.6]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 48273180066D; Wed, 11 Feb 2026 10:02:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770804169; 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=5XFLgcgIJf4ihDQXzUgzIhmbnKsdK8VFUYV10YosG7M=; b=QmViMrMmWpcPAso/+/9vpln7KSEvEF6QulyBZr5WszH6J62diPWc1l3AUcu8i0unvEpEer XODlfKXDFA6WJJEOnq+2GUZyBKm2HneMO/TrQhkrrnumCYXz6NEkqXM8/C4H1VEfK0xW+d 76RoHEN3ZyptIfrAqE6dTq6GYwRx1Pw= X-MC-Unique: QTMDxZAhNsGxjWG0IwCrrw-1 X-Mimecast-MFC-AGG-ID: QTMDxZAhNsGxjWG0IwCrrw_1770804165 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 11 Feb 2026 14:01:46 +0400 Subject: [PATCH 6/7] ui: drop legacy spice < 0.15 support code MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260211-cleanups-v1-6-e63c96572389@redhat.com> References: <20260211-cleanups-v1-0-e63c96572389@redhat.com> In-Reply-To: <20260211-cleanups-v1-0-e63c96572389@redhat.com> To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , John Snow , Cleber Rosa , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Developer-Signature: v=1; a=openpgp-sha256; l=6349; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=FbhCL/V8MMmRvoZlhK350xscVaqM6HdtTqLFN8kGI6o=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBpjFOVnrZZqAuTaDC35hlaVzyQc3G3nSKF4W6x6 7CUQl3S4OeJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaYxTlQAKCRDa6OEJdZac 5ZCtD/9CloayJtH+t0robP/k21MYK1wzECtkQuDHAlJdhbTfntXktRypT51WO/hy6DURLm5O91Y ByuH9g4FWOLBzguFjQBH0AdJ0m2fqonncUvsO/zKeJr/JLYw/gd8x/BUjY55XPQ48JH4s0+VB5I YvHCHQpOhP9tDSg0GVUERl9jZ2zNSrAJDZoVU+QYNmolVBdaWNgpPbjIR97kNjk9teQ/yBjIQcF WO3dhLoU0ko6YHgsFMULVST9By1xRdk3mlzXN5Gh+Kl3+CpskZI59uaq6+YRGB6InZFcp/xs4/V oIGUAaoWjyDgt5qLZkQK7iU6K3HVlK8eqF8D/NHi/uOInuc6/CCBVTKpMSxOPLTxTwBJUT5sY92 s0LHyHl7L6olAttipcoMqCitBMgJW8jcl4q/1q8yCZb+Qprzcdk2K+JO1wRhRbIwWbxmNiGCB8p IADjec/btM89FHLzzH0tI+9SDOERL2C5rv0Qfk8ZAOvzpziwLZ4CrabNVj2Zoo/09+w2oazAXhK 7b2fxoEwUIv/kRhmhT4aJETFvDqqdZ3EVL1gH9J7kAQuUAnygAj1lm73qPWILSBhvfZ2PF+Lfi3 Jku1QrghbrtBFiir/jqcVkPPtIgVxadklI8WMSxvxgr9rZ549/+OTCEvGBCD3ct359gSoVAtlQW WNObSqLfgY0Qxmw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1770804192985154100 Signed-off-by: Marc-Andr=C3=A9 Lureau --- 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); =20 -#if SPICE_SERVER_VERSION >=3D 0x000f00 /* release 0.15.0 */ -#define SPICE_HAS_ATTACHED_WORKER 1 -#else -#define SPICE_HAS_ATTACHED_WORKER 0 -#endif - #else /* CONFIG_SPICE */ =20 #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, } =20 *be_opened =3D false; -#if SPICE_SERVER_VERSION < 0x000e02 - /* Spice < 0.14.2 doesn't explicitly open smartcard chardev */ - if (strcmp(type, "smartcard") =3D=3D 0) { - *be_opened =3D true; - } -#endif chr_open(chr, type); } =20 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(PCIQXLDevi= ce *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 =3D 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); } =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); @@ -1136,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 @@ -2109,6 +2092,8 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Err= or **errp) uint8_t* config =3D qxl->pci.config; uint32_t pci_device_rev; uint32_t io_size; + Error *err =3D NULL; + char device_address[256] =3D ""; =20 qemu_spice_display_init_common(&qxl->ssd); qxl->mode =3D QXL_MODE_UNDEFINED; @@ -2208,9 +2193,6 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Err= or **errp) return; } =20 -#if SPICE_SERVER_VERSION >=3D 0x000e02 /* release 0.14.2 */ - Error *err =3D NULL; - char device_address[256] =3D ""; if (qemu_console_fill_device_address(qxl->vga.con, device_address, sizeof(device_add= ress), &err)) { @@ -2221,7 +2203,6 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Err= or **errp) } else { error_report_err(err); } -#endif =20 qemu_add_vm_change_state_handler(qxl_vm_change_state_handler, qxl); =20 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 *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) { @@ -689,13 +682,11 @@ static int interface_client_monitors_config(QXLInstan= ce *sin, if (mc->num_of_monitors > head) { info.width =3D mc->monitors[head].width; info.height =3D mc->monitors[head].height; -#if SPICE_SERVER_VERSION >=3D 0x000e04 /* release 0.14.4 */ if (mc->flags & VD_AGENT_CONFIG_MONITORS_FLAG_PHYSICAL_SIZE) { VDAgentMonitorMM *mm =3D (void *)&mc->monitors[mc->num_of_moni= tors]; info.width_mm =3D mm[head].width; info.height_mm =3D mm[head].height; } -#endif } =20 trace_qemu_spice_ui_info(ssd->qxl.id, info.width, info.height); @@ -709,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 @@ -1414,7 +1401,6 @@ static void qemu_spice_display_init_one(QemuConsole *= con) ssd->qxl.base.sif =3D &dpy_interface.base; qemu_spice_add_display_interface(&ssd->qxl, con); =20 -#if SPICE_SERVER_VERSION >=3D 0x000e02 /* release 0.14.2 */ Error *err =3D NULL; char device_address[256] =3D ""; 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 =20 qemu_spice_create_host_memslot(ssd); =20 --=20 2.52.0