From nobody Sun Apr 12 06:03:50 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=1770813055; cv=none; d=zohomail.com; s=zohoarc; b=oKWcVeaDfwBA7HwcMyBJTO4kXitByv5yfbruSE463ajI2HIeIGLvDWQ1ITo0H/3Y+KVkZeFZqCEl7rfyAYmMv7gseA/IviO/m+OOEz5tpYpHBZaqgOjyz5wIIAyAv5O6p5RW5kyzP5w54zdQElJXBSRSVlMyIsWYNpa6uhVc0jc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770813055; 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=cGBq4qMkI/q12TmIhq+tbmp2Snz+Rz/20mUay39k8ag=; b=Nps8FlY6Y2fkM6vs0bf+UsjwjlC0valOBP3BTvoj9XkW4RqWtX5dLB2dZc5N+OJeaRiPSJffCF6ruw2dCpU46KjVsuov4XdkifaXl6dxPNSLAO7JYX8TiEtq5r/Y6YR5Gz8PRSz0nO0LoJzI71nTrvFylBKrcKPeApc/hSW2g28= 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 1770813055381543.1209598995126; Wed, 11 Feb 2026 04:30:55 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1227447.1533852 (Exim 4.92) (envelope-from ) id 1vq9MU-0002Ib-T8; Wed, 11 Feb 2026 12:30:30 +0000 Received: by outflank-mailman (output) from mailman id 1227447.1533852; Wed, 11 Feb 2026 12:30:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vq9MU-0002IL-PM; Wed, 11 Feb 2026 12:30:30 +0000 Received: by outflank-mailman (input) for mailman id 1227447; Wed, 11 Feb 2026 12:30:29 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vq9MT-0001nh-Kb for xen-devel@lists.xenproject.org; Wed, 11 Feb 2026 12:30:29 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 721b9526-0745-11f1-b162-2bf370ae4941; Wed, 11 Feb 2026 13:30:28 +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-372-KX-bclq4MP2GmkzEZbJ6MA-1; Wed, 11 Feb 2026 07:30:25 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C3A5D180025C; Wed, 11 Feb 2026 12:30:23 +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 4D1A3180066F; Wed, 11 Feb 2026 12:30:21 +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: 721b9526-0745-11f1-b162-2bf370ae4941 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770813027; 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=cGBq4qMkI/q12TmIhq+tbmp2Snz+Rz/20mUay39k8ag=; b=FHRdi0ClHZ5J9lxznEJoELYW/3/R3fJlQzdKwCiQyQm253TS1bCuWG6gRA1vkxspbg9lce IIcGyIc8jIQSuhvpuVLNzVe0UcCZBEAiJU01S63h9JFL7a3/jexGU2LFGqBv3TUFMs0nID RYJJOwuWZCZqYB2cGFgBOp2I0p/mwMQ= X-MC-Unique: KX-bclq4MP2GmkzEZbJ6MA-1 X-Mimecast-MFC-AGG-ID: KX-bclq4MP2GmkzEZbJ6MA_1770813024 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 02/14] ui/spice: Require spice-server >= 0.15.0 Date: Wed, 11 Feb 2026 16:29:49 +0400 Message-ID: <20260211123007.3569932-3-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.4.1 on 10.30.177.93 X-Mimecast-MFC-PROC-ID: VoCalRhe8zsb_DYcXXzNBMoSURMpIyTnQ_Lqv3Pf_68_1770813024 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: 1770813058466158500 From: Vladimir Sementsov-Ogievskiy For major distributions we have now: Debian 13: 0.15.2 Ubuntu 22.04: 0.15.0 RHEL-9/CentOS Stream 9: SPICE is removed Fedora 42: 0.15.1 OpenSUSE Leap 15.4: 0.15.0 Time to update the dependancy in QEMU and drop almost all SPICE_SERVER_VERSION checks. Suggested-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20260115144606.233252-2-vsementsov@yandex-team.ru> --- meson.build | 2 +- include/ui/qemu-spice.h | 4 ---- chardev/spice.c | 6 ------ hw/display/qxl.c | 11 ++--------- ui/spice-display.c | 8 ++------ 5 files changed, 5 insertions(+), 26 deletions(-) diff --git a/meson.build b/meson.build index 2d114e90184..9c12e0db601 100644 --- a/meson.build +++ b/meson.build @@ -1320,7 +1320,7 @@ if get_option('spice') \ .require(pixman.found(), error_message: 'cannot enable SPICE if pixman is not= available') \ .allowed() - spice =3D dependency('spice-server', version: '>=3D0.14.0', + spice =3D dependency('spice-server', version: '>=3D0.15.0', required: get_option('spice'), method: 'pkg-config') endif diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h index b7d493742c4..8e5e6b2a744 100644 --- a/include/ui/qemu-spice.h +++ b/include/ui/qemu-spice.h @@ -34,11 +34,7 @@ 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 =20 #else /* CONFIG_SPICE */ =20 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..fbba02113f7 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, @@ -2109,6 +2104,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 +2205,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 +2215,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..f2304bb0ce2 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -689,13 +689,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); @@ -1393,6 +1391,8 @@ static const DisplayGLCtxOps gl_ctx_ops =3D { static void qemu_spice_display_init_one(QemuConsole *con) { SimpleSpiceDisplay *ssd =3D g_new0(SimpleSpiceDisplay, 1); + Error *err =3D NULL; + char device_address[256] =3D ""; =20 qemu_spice_display_init_common(ssd); =20 @@ -1414,9 +1414,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)) { spice_qxl_set_device_info(&ssd->qxl, device_address, @@ -1425,7 +1422,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