From nobody Sun Apr 12 05:57:52 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=1770804186; cv=none; d=zohomail.com; s=zohoarc; b=SynTdf69AQ5Q8eJpQ1xIOZfbZcFImr6WQaHuuQlHXfPrwDWKcsB3COnqCgTUOAmwX7YbzFIXETUD3GS/kISb6hleJtEUCKx/w98g+XWPIFoyUgT2WemiHOzIpEC7m/YX8gQbnhJojlmPfCugPmMNAproc5aI3AW5uK5uezfAmas= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770804186; 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=O1yPiV6/tD/XRWgMlrMoMoyq+hWEGWK4xROVUU6ku/s=; b=SjHfxeOXSvb3r4z/kx3431jUl3lUodW67+BqdofnIRQPCg+HCqene1fAuJsj5wTUGsfPw7YRQhOTtTq/1JABA6RBsnBgFJfeXWjgEmS9eADtZ5AXQkV+MSFVH3ZL5ZtOuHBZfXNBNbkwir0pneFNbMWUAPlWgAb/RK04rrmrGeI= 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 1770804186566464.70529830311216; Wed, 11 Feb 2026 02:03:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vq73Z-0001UX-DG; Wed, 11 Feb 2026 05:02:49 -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 1vq73V-00015A-Rx for qemu-devel@nongnu.org; Wed, 11 Feb 2026 05:02:45 -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 1vq73U-0002zo-7E for qemu-devel@nongnu.org; Wed, 11 Feb 2026 05:02:45 -0500 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-398-hiKoJu7hP_OgXtG0Qrf9tg-1; Wed, 11 Feb 2026 05:02:40 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 43D5A18003F6; Wed, 11 Feb 2026 10:02:39 +0000 (UTC) Received: from localhost (unknown [10.45.242.6]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D85601956053; Wed, 11 Feb 2026 10:02:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770804163; 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=O1yPiV6/tD/XRWgMlrMoMoyq+hWEGWK4xROVUU6ku/s=; b=YD1IvgrGzvXs6bGViHWizyEqmBI3XVfZA85rdV5VWC+n/84sm/ocPFXihghbB9rmqtZaJs kxaB92obrsE3Lf4nZmZ7sHVgpaEJDieYlcfgKlna+61c+uSRDTgM4medY2ChINgL7/DE1l XlrUFzoihponB50TDk3bXsuBkVvflzQ= X-MC-Unique: hiKoJu7hP_OgXtG0Qrf9tg-1 X-Mimecast-MFC-AGG-ID: hiKoJu7hP_OgXtG0Qrf9tg_1770804159 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 11 Feb 2026 14:01:45 +0400 Subject: [PATCH 5/7] audio: require spice >= 0.15 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260211-cleanups-v1-5-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=5284; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=u9Xu4eBPvh5df7XfEv+bIF6n0ePy5VZVQtW0TQCzngk=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBpjFOV0MMlWEqlYTVEyz32xN6cynqy3bpSkWaW7 hZS+9xOlkyJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaYxTlQAKCRDa6OEJdZac 5Z9eEAC30tXbDmxK1fT1rfU/1ClMbQMg4H0ln6G9J94wLZTzhwjAmSciRFhMD4uZi3IJrJf1HJ6 F+AVDWSUlJ4+wrNuP824yodxkBRS14YXfj+irFHRhn+bwGSxnMH9QRox6zHeWlC4YWVQ+XAcRKl 18DaCaIFH5z8uGjLR65UZi3MFqmnyrttZuz++N2VY6D486U2zBoWk6fhdEdYSRt8k+92LevDQ2W gwxs65zIl3bR0kS+N8aACHBe6tDsql5aheje7chnvAw/f4kP2Gholw2QNGdMkWEBVGl7q8osPHD q8cUyLs7B1EQQ/T8J016tK6UJoBbDgQEsozfMFxmB3IfrF5mvsIHBl/bsrEobQig4L95OGKpSK8 WV4z2w1UeVSJCqs7nUJmU7pFkhgUgeCIERimMZOEhTDIArYlnkzjhlwb6pwHTxRCUDaFC4NY+1F 9lMAZtNnAc7MvHLXHK1Nr0Pxc0clnPZzBuAcbO+Q92h28eOVJZGeY494fHQ73zVuV5zBC+vhLsd SoLVzhwkRSYlV+kIa1WdhQuVU2AFMwr3l1CL2KNy15ulgKWezVBBLUVopapxQoEJ/oeDjfw8hpK oGbrd7nVV/xWfRDBce3y3vhd1aVsVl0y+mXZ1uVnm/zjn/DIRMz+z6QxUA/WBs6m2+XAriQWkKG dkM8jN20KIrO3jw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: 1770804189093154100 Spice server 0.15.0 was released on 2021-04-16. It is part of all our supported distro (except CentOS 9, which doesn't include it). It has all the new required audio APIs/interfaces. Signed-off-by: Marc-Andr=C3=A9 Lureau --- meson.build | 2 +- audio/spiceaudio.c | 30 ------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/meson.build b/meson.build index fb89fbd1cc5..5c3e138309f 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/audio/spiceaudio.c b/audio/spiceaudio.c index 7db2d1f0dfd..9974e038574 100644 --- a/audio/spiceaudio.c +++ b/audio/spiceaudio.c @@ -29,17 +29,8 @@ #include "qemu/audio.h" #include "audio_int.h" =20 -#if SPICE_INTERFACE_PLAYBACK_MAJOR > 1 || SPICE_INTERFACE_PLAYBACK_MINOR >= =3D 3 #define LINE_OUT_SAMPLES (480 * 4) -#else -#define LINE_OUT_SAMPLES (256 * 4) -#endif - -#if SPICE_INTERFACE_RECORD_MAJOR > 2 || SPICE_INTERFACE_RECORD_MINOR >=3D 3 #define LINE_IN_SAMPLES (480 * 4) -#else -#define LINE_IN_SAMPLES (256 * 4) -#endif =20 typedef struct SpiceVoiceOut { HWVoiceOut hw; @@ -95,11 +86,7 @@ static int line_out_init(HWVoiceOut *hw, struct audsetti= ngs *as, SpiceVoiceOut *out =3D container_of (hw, SpiceVoiceOut, hw); struct audsettings settings; =20 -#if SPICE_INTERFACE_PLAYBACK_MAJOR > 1 || SPICE_INTERFACE_PLAYBACK_MINOR >= =3D 3 settings.freq =3D spice_server_get_best_playback_rate(NULL); -#else - settings.freq =3D SPICE_INTERFACE_PLAYBACK_FREQ; -#endif settings.nchannels =3D SPICE_INTERFACE_PLAYBACK_CHAN; settings.fmt =3D AUDIO_FORMAT_S16; settings.endianness =3D HOST_BIG_ENDIAN; @@ -110,9 +97,7 @@ static int line_out_init(HWVoiceOut *hw, struct audsetti= ngs *as, =20 out->sin.base.sif =3D &playback_sif.base; qemu_spice.add_interface(&out->sin.base); -#if SPICE_INTERFACE_PLAYBACK_MAJOR > 1 || SPICE_INTERFACE_PLAYBACK_MINOR >= =3D 3 spice_server_set_playback_rate(&out->sin, settings.freq); -#endif return 0; } =20 @@ -190,7 +175,6 @@ static void line_out_enable(HWVoiceOut *hw, bool enable) } } =20 -#if ((SPICE_INTERFACE_PLAYBACK_MAJOR >=3D 1) && (SPICE_INTERFACE_PLAYBACK_= MINOR >=3D 2)) static void line_out_volume(HWVoiceOut *hw, Volume *vol) { SpiceVoiceOut *out =3D container_of(hw, SpiceVoiceOut, hw); @@ -202,7 +186,6 @@ static void line_out_volume(HWVoiceOut *hw, Volume *vol) spice_server_playback_set_volume(&out->sin, 2, svol); spice_server_playback_set_mute(&out->sin, vol->mute); } -#endif =20 /* record */ =20 @@ -211,11 +194,7 @@ static int line_in_init(HWVoiceIn *hw, struct audsetti= ngs *as, void *drv_opaque) SpiceVoiceIn *in =3D container_of (hw, SpiceVoiceIn, hw); struct audsettings settings; =20 -#if SPICE_INTERFACE_RECORD_MAJOR > 2 || SPICE_INTERFACE_RECORD_MINOR >=3D 3 settings.freq =3D spice_server_get_best_record_rate(NULL); -#else - settings.freq =3D SPICE_INTERFACE_RECORD_FREQ; -#endif settings.nchannels =3D SPICE_INTERFACE_RECORD_CHAN; settings.fmt =3D AUDIO_FORMAT_S16; settings.endianness =3D HOST_BIG_ENDIAN; @@ -226,9 +205,7 @@ static int line_in_init(HWVoiceIn *hw, struct audsettin= gs *as, void *drv_opaque) =20 in->sin.base.sif =3D &record_sif.base; qemu_spice.add_interface(&in->sin.base); -#if SPICE_INTERFACE_RECORD_MAJOR > 2 || SPICE_INTERFACE_RECORD_MINOR >=3D 3 spice_server_set_record_rate(&in->sin, settings.freq); -#endif return 0; } =20 @@ -277,7 +254,6 @@ static void line_in_enable(HWVoiceIn *hw, bool enable) } } =20 -#if ((SPICE_INTERFACE_RECORD_MAJOR >=3D 2) && (SPICE_INTERFACE_RECORD_MINO= R >=3D 2)) static void line_in_volume(HWVoiceIn *hw, Volume *vol) { SpiceVoiceIn *in =3D container_of(hw, SpiceVoiceIn, hw); @@ -289,7 +265,6 @@ static void line_in_volume(HWVoiceIn *hw, Volume *vol) spice_server_record_set_volume(&in->sin, 2, svol); spice_server_record_set_mute(&in->sin, vol->mute); } -#endif =20 static struct audio_pcm_ops audio_callbacks =3D { .init_out =3D line_out_init, @@ -299,19 +274,14 @@ static struct audio_pcm_ops audio_callbacks =3D { .get_buffer_out =3D line_out_get_buffer, .put_buffer_out =3D line_out_put_buffer, .enable_out =3D line_out_enable, -#if (SPICE_INTERFACE_PLAYBACK_MAJOR >=3D 1) && \ - (SPICE_INTERFACE_PLAYBACK_MINOR >=3D 2) .volume_out =3D line_out_volume, -#endif =20 .init_in =3D line_in_init, .fini_in =3D line_in_fini, .read =3D line_in_read, .run_buffer_in =3D audio_generic_run_buffer_in, .enable_in =3D line_in_enable, -#if ((SPICE_INTERFACE_RECORD_MAJOR >=3D 2) && (SPICE_INTERFACE_RECORD_MINO= R >=3D 2)) .volume_in =3D line_in_volume, -#endif }; =20 static struct audio_driver spice_audio_driver =3D { --=20 2.52.0