From nobody Fri Nov 7 14:37:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548336463267921.7542482593766; Thu, 24 Jan 2019 05:27:43 -0800 (PST) Received: from localhost ([127.0.0.1]:53915 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmf2c-0002hl-7L for importer@patchew.org; Thu, 24 Jan 2019 08:27:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmew9-0006CV-1v for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmew5-0007Yv-8M for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40160) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmew3-0007LV-3S for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:49 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 54F1AA1706; Thu, 24 Jan 2019 13:20:29 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-232.ams2.redhat.com [10.36.117.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id 174201048107; Thu, 24 Jan 2019 13:20:21 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 159741FCD6; Thu, 24 Jan 2019 14:20:20 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 24 Jan 2019 14:20:14 +0100 Message-Id: <20190124132020.13571-2-kraxel@redhat.com> In-Reply-To: <20190124132020.13571-1-kraxel@redhat.com> References: <20190124132020.13571-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 24 Jan 2019 13:20:29 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/7] audio: fix pc speaker init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Brad Smith Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Get rid of the pcspk_state global, allow pc speaker be added using "-device isa-pcspk". Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20190124110810.1040-1-kraxel@redhat.com --- hw/audio/pcspk.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 908696d483..b80a62ce90 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -57,7 +57,6 @@ typedef struct { } PCSpkState; =20 static const char *s_spk =3D "pcspk"; -static PCSpkState *pcspk_state; =20 static inline void generate_samples(PCSpkState *s) { @@ -111,22 +110,6 @@ static void pcspk_callback(void *opaque, int free) } } =20 -static int pcspk_audio_init(ISABus *bus) -{ - PCSpkState *s =3D pcspk_state; - struct audsettings as =3D {PCSPK_SAMPLE_RATE, 1, AUD_FMT_U8, 0}; - - AUD_register_card(s_spk, &s->card); - - s->voice =3D AUD_open_out(&s->card, s->voice, s_spk, s, pcspk_callback= , &as); - if (!s->voice) { - AUD_log(s_spk, "Could not open voice\n"); - return -1; - } - - return 0; -} - static uint64_t pcspk_io_read(void *opaque, hwaddr addr, unsigned size) { @@ -179,12 +162,20 @@ static void pcspk_initfn(Object *obj) =20 static void pcspk_realizefn(DeviceState *dev, Error **errp) { + struct audsettings as =3D {PCSPK_SAMPLE_RATE, 1, AUD_FMT_U8, 0}; ISADevice *isadev =3D ISA_DEVICE(dev); PCSpkState *s =3D PC_SPEAKER(dev); =20 isa_register_ioport(isadev, &s->ioport, s->iobase); =20 - pcspk_state =3D s; + AUD_register_card(s_spk, &s->card); + + s->voice =3D AUD_open_out(&s->card, s->voice, s_spk, s, pcspk_callback= , &as); + if (!s->voice) { + error_setg(errp, "Initializing audio voice failed"); + AUD_remove_card(&s->card); + return; + } } =20 static bool migrate_needed(void *opaque) @@ -221,8 +212,6 @@ static void pcspk_class_initfn(ObjectClass *klass, void= *data) set_bit(DEVICE_CATEGORY_SOUND, dc->categories); dc->vmsd =3D &vmstate_spk; dc->props =3D pcspk_properties; - /* Reason: realize sets global pcspk_state */ - dc->user_creatable =3D false; } =20 static const TypeInfo pcspk_info =3D { @@ -233,6 +222,12 @@ static const TypeInfo pcspk_info =3D { .class_init =3D pcspk_class_initfn, }; =20 +static int pcspk_audio_init(ISABus *bus) +{ + isa_create_simple(bus, TYPE_PC_SPEAKER); + return 0; +} + static void pcspk_register(void) { type_register_static(&pcspk_info); --=20 2.9.3 From nobody Fri Nov 7 14:37:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548336337303296.7741332064711; Thu, 24 Jan 2019 05:25:37 -0800 (PST) Received: from localhost ([127.0.0.1]:53879 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmf0g-00014o-8k for importer@patchew.org; Thu, 24 Jan 2019 08:25:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54414) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmew1-00067m-4f for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmevz-0007Tz-7W for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59846) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmevx-0007Nq-6V for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:43 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 360E9124D01; Thu, 24 Jan 2019 13:20:32 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-232.ams2.redhat.com [10.36.117.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id 563A16D099; Thu, 24 Jan 2019 13:20:21 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1F18D1FCD9; Thu, 24 Jan 2019 14:20:20 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 24 Jan 2019 14:20:15 +0100 Message-Id: <20190124132020.13571-3-kraxel@redhat.com> In-Reply-To: <20190124132020.13571-1-kraxel@redhat.com> References: <20190124132020.13571-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 24 Jan 2019 13:20:32 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/7] audio: use pkg-config X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Brad Smith Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Use pkg-config to probe for alsa and pulseaudio. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20190124112055.547-2-kraxel@redhat.com --- configure | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/configure b/configure index 8f312ac3e2..5fcd0f4795 100755 --- a/configure +++ b/configure @@ -3342,39 +3342,26 @@ fi ########################################## # Sound support libraries probe =20 -audio_drv_probe() -{ - drv=3D$1 - hdr=3D$2 - lib=3D$3 - exp=3D$4 - cfl=3D$5 - cat > $TMPC << EOF -#include <$hdr> -int main(void) { $exp } -EOF - if compile_prog "$cfl" "$lib" ; then - : - else - error_exit "$drv check failed" \ - "Make sure to have the $drv libs and headers installed." - fi -} - audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/,/ /g') for drv in $audio_drv_list; do case $drv in alsa) - audio_drv_probe $drv alsa/asoundlib.h -lasound \ - "return snd_pcm_close((snd_pcm_t *)0);" - alsa_libs=3D"-lasound" + if $pkg_config alsa --exists; then + alsa_libs=3D$($pkg_config alsa --libs) + else + error_exit "$drv check failed" \ + "Make sure to have the $drv libs and headers installed." + fi ;; =20 pa) - audio_drv_probe $drv pulse/pulseaudio.h "-lpulse" \ - "pa_context_set_source_output_volume(NULL, 0, NULL, NULL, NULL); r= eturn 0;" - pulse_libs=3D"-lpulse" - audio_pt_int=3D"yes" + if $pkg_config libpulse --exists; then + pulse_libs=3D$($pkg_config libpulse --libs) + audio_pt_int=3D"yes" + else + error_exit "$drv check failed" \ + "Make sure to have the $drv libs and headers installed." + fi ;; =20 sdl) --=20 2.9.3 From nobody Fri Nov 7 14:37:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548336337116814.4475588460691; Thu, 24 Jan 2019 05:25:37 -0800 (PST) Received: from localhost ([127.0.0.1]:53875 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmf0g-00014F-3x for importer@patchew.org; Thu, 24 Jan 2019 08:25:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmew7-0006CT-21 for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmew5-0007YD-3l for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52758) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmew1-0007Li-64 for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:47 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 594703C52; Thu, 24 Jan 2019 13:20:29 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-232.ams2.redhat.com [10.36.117.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1210767179; Thu, 24 Jan 2019 13:20:21 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2A7DF31EEB; Thu, 24 Jan 2019 14:20:20 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 24 Jan 2019 14:20:16 +0100 Message-Id: <20190124132020.13571-4-kraxel@redhat.com> In-Reply-To: <20190124132020.13571-1-kraxel@redhat.com> References: <20190124132020.13571-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 24 Jan 2019 13:20:29 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/7] audio: allow optional audio drivers. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Brad Smith Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" For those audio drivers which can be probed (sdl, alsa, pulse) add a try-$name variants. Unlike the variants without try- prefix they will not error out on probe failure, the driver will be dropped from the list instead. Mainly useful for the audio_drv_list default values. Signed-off-by: Gerd Hoffmann Message-id: 20190124112055.547-3-kraxel@redhat.com --- configure | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 5fcd0f4795..6a2aa3b533 100755 --- a/configure +++ b/configure @@ -3345,22 +3345,36 @@ fi audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/,/ /g') for drv in $audio_drv_list; do case $drv in - alsa) + alsa | try-alsa) if $pkg_config alsa --exists; then alsa_libs=3D$($pkg_config alsa --libs) + if test "$drv" =3D "try-alsa"; then + audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/try-alsa= /alsa/') + fi else - error_exit "$drv check failed" \ - "Make sure to have the $drv libs and headers installed." + if test "$drv" =3D "try-alsa"; then + audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/try-alsa= //') + else + error_exit "$drv check failed" \ + "Make sure to have the $drv libs and headers installed." + fi fi ;; =20 - pa) + pa | try-pa) if $pkg_config libpulse --exists; then pulse_libs=3D$($pkg_config libpulse --libs) audio_pt_int=3D"yes" + if test "$drv" =3D "try-pa"; then + audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/try-pa/p= a/') + fi else - error_exit "$drv check failed" \ - "Make sure to have the $drv libs and headers installed." + if test "$drv" =3D "try-pa"; then + audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/try-pa//= ') + else + error_exit "$drv check failed" \ + "Make sure to have the $drv libs and headers installed." + fi fi ;; =20 @@ -3370,6 +3384,14 @@ for drv in $audio_drv_list; do fi ;; =20 + try-sdl) + if test "$sdl" =3D "no"; then + audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/try-sdl//') + else + audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/try-sdl/sdl/= ') + fi + ;; + coreaudio) coreaudio_libs=3D"-framework CoreAudio" ;; --=20 2.9.3 From nobody Fri Nov 7 14:37:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548336194249870.8443607875801; Thu, 24 Jan 2019 05:23:14 -0800 (PST) Received: from localhost ([127.0.0.1]:53838 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmeyA-0007Gw-4d for importer@patchew.org; Thu, 24 Jan 2019 08:22:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmew1-00067l-4e for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmevz-0007Tm-4f for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54912) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmevx-0007Fy-40 for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:41 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 092ADC0C9A62; Thu, 24 Jan 2019 13:20:25 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-232.ams2.redhat.com [10.36.117.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A7DE60564; Thu, 24 Jan 2019 13:20:21 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3362E31F14; Thu, 24 Jan 2019 14:20:20 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 24 Jan 2019 14:20:17 +0100 Message-Id: <20190124132020.13571-5-kraxel@redhat.com> In-Reply-To: <20190124132020.13571-1-kraxel@redhat.com> References: <20190124132020.13571-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 24 Jan 2019 13:20:25 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 4/7] audio: use try-sdl for openbsd X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Brad Smith Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Fixes the openbsd build failure with SDL disabled. Signed-off-by: Gerd Hoffmann Message-id: 20190124112055.547-4-kraxel@redhat.com --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 6a2aa3b533..1eff5946f6 100755 --- a/configure +++ b/configure @@ -829,7 +829,7 @@ NetBSD) OpenBSD) bsd=3D"yes" make=3D"${MAKE-gmake}" - audio_drv_list=3D"sdl" + audio_drv_list=3D"try-sdl" audio_possible_drivers=3D"sdl" HOST_VARIANT_DIR=3D"openbsd" supported_os=3D"yes" --=20 2.9.3 From nobody Fri Nov 7 14:37:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548336196019399.45991113099217; Thu, 24 Jan 2019 05:23:16 -0800 (PST) Received: from localhost ([127.0.0.1]:53842 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmeyN-0007SJ-Re for importer@patchew.org; Thu, 24 Jan 2019 08:23:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54560) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmewB-0006Ed-BJ for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmew5-0007YL-65 for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59848) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmew1-0007Nu-6s for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:47 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4712A124D00; Thu, 24 Jan 2019 13:20:32 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-232.ams2.redhat.com [10.36.117.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id C554A6D094; Thu, 24 Jan 2019 13:20:25 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3BD4B4F971; Thu, 24 Jan 2019 14:20:20 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 24 Jan 2019 14:20:18 +0100 Message-Id: <20190124132020.13571-6-kraxel@redhat.com> In-Reply-To: <20190124132020.13571-1-kraxel@redhat.com> References: <20190124132020.13571-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 24 Jan 2019 13:20:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 5/7] audio: check for pulseaudio daemon pidfile X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Brad Smith Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Check whenever the pulseaudio daemon pidfile is present before trying to initialize the pulseaudio backend. Just return NULL if that is not the case, so qemu will check the next backend in line. In case the user explicitly configured a non-default pulseaudio server skip the check. Signed-off-by: Gerd Hoffmann Message-id: 20190124112055.547-5-kraxel@redhat.com --- audio/paaudio.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/audio/paaudio.c b/audio/paaudio.c index 4c100bc318..6153b908da 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -814,6 +814,21 @@ static PAConf glob_conf =3D { =20 static void *qpa_audio_init (void) { + if (glob_conf.server =3D=3D NULL) { + char pidfile[64]; + char *runtime; + struct stat st; + + runtime =3D getenv("XDG_RUNTIME_DIR"); + if (!runtime) { + return NULL; + } + snprintf(pidfile, sizeof(pidfile), "%s/pulse/pid", runtime); + if (stat(pidfile, &st) !=3D 0) { + return NULL; + } + } + paaudio *g =3D g_malloc(sizeof(paaudio)); g->conf =3D glob_conf; g->mainloop =3D NULL; --=20 2.9.3 From nobody Fri Nov 7 14:37:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548336300630994.0636845150701; Thu, 24 Jan 2019 05:25:00 -0800 (PST) Received: from localhost ([127.0.0.1]:53861 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmf03-0000Xg-KZ for importer@patchew.org; Thu, 24 Jan 2019 08:24:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmevz-00066h-4S for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmevx-0007SR-91 for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59820) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmevx-0007N1-1S for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:41 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 515A0124D0B; Thu, 24 Jan 2019 13:20:31 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-232.ams2.redhat.com [10.36.117.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id C7F4326E69; Thu, 24 Jan 2019 13:20:25 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 440AE4F972; Thu, 24 Jan 2019 14:20:20 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 24 Jan 2019 14:20:19 +0100 Message-Id: <20190124132020.13571-7-kraxel@redhat.com> In-Reply-To: <20190124132020.13571-1-kraxel@redhat.com> References: <20190124132020.13571-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 24 Jan 2019 13:20:31 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 6/7] audio: error message tweak X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Brad Smith Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Only print a message about the failed driver initialization in case it was the driver explicitly requested by the user via QEMU_AUDIO_DRV=3D$drv. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20190124112055.547-6-kraxel@redhat.com --- audio/audio.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 1ace47f510..d163ffbc88 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1762,7 +1762,7 @@ void AUD_help (void) ); } =20 -static int audio_driver_init (AudioState *s, struct audio_driver *drv) +static int audio_driver_init(AudioState *s, struct audio_driver *drv, bool= msg) { if (drv->options) { audio_process_options (drv->name, drv->options); @@ -1776,7 +1776,9 @@ static int audio_driver_init (AudioState *s, struct a= udio_driver *drv) return 0; } else { - dolog ("Could not init `%s' audio driver\n", drv->name); + if (msg) { + dolog("Could not init `%s' audio driver\n", drv->name); + } return -1; } } @@ -1901,7 +1903,7 @@ static void audio_init (void) if (drvname) { driver =3D audio_driver_lookup(drvname); if (driver) { - done =3D !audio_driver_init(s, driver); + done =3D !audio_driver_init(s, driver, true); } else { dolog ("Unknown audio driver `%s'\n", drvname); dolog ("Run with -audio-help to list available drivers\n"); @@ -1912,14 +1914,14 @@ static void audio_init (void) for (i =3D 0; !done && i < ARRAY_SIZE(audio_prio_list); i++) { driver =3D audio_driver_lookup(audio_prio_list[i]); if (driver && driver->can_be_default) { - done =3D !audio_driver_init(s, driver); + done =3D !audio_driver_init(s, driver, false); } } } =20 if (!done) { driver =3D audio_driver_lookup("none"); - done =3D !audio_driver_init(s, driver); + done =3D !audio_driver_init(s, driver, false); assert(done); dolog("warning: Using timer based audio emulation\n"); } --=20 2.9.3 From nobody Fri Nov 7 14:37:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548336193337564.53667501503; Thu, 24 Jan 2019 05:23:13 -0800 (PST) Received: from localhost ([127.0.0.1]:53840 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmey9-0007HI-Nx for importer@patchew.org; Thu, 24 Jan 2019 08:22:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmew1-00067n-4l for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmevz-0007Th-4U for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52806) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmevx-0007Nr-4D for qemu-devel@nongnu.org; Thu, 24 Jan 2019 08:20:41 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 454CD43A25; Thu, 24 Jan 2019 13:20:32 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-232.ams2.redhat.com [10.36.117.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id F09A56D097; Thu, 24 Jan 2019 13:20:29 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4C4A94FD6A; Thu, 24 Jan 2019 14:20:20 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 24 Jan 2019 14:20:20 +0100 Message-Id: <20190124132020.13571-8-kraxel@redhat.com> In-Reply-To: <20190124132020.13571-1-kraxel@redhat.com> References: <20190124132020.13571-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 24 Jan 2019 13:20:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 7/7] audio: probe audio drivers by default X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Brad Smith Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add the drivers listed in audio_possible_drivers to audio_drv_list, using the try-* variants. That way the probable drivers are compiled by default if possible. Additioal tweaks: linux: reorder to: pa alsa sdl oss. *bsd: drop pa. Signed-off-by: Gerd Hoffmann Message-id: 20190124112055.547-7-kraxel@redhat.com --- configure | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 1eff5946f6..b18281c61f 100755 --- a/configure +++ b/configure @@ -794,13 +794,13 @@ MINGW32*) ;; GNU/kFreeBSD) bsd=3D"yes" - audio_drv_list=3D"oss" + audio_drv_list=3D"oss try-sdl" audio_possible_drivers=3D"oss sdl pa" ;; FreeBSD) bsd=3D"yes" make=3D"${MAKE-gmake}" - audio_drv_list=3D"oss" + audio_drv_list=3D"oss try-sdl" audio_possible_drivers=3D"oss sdl pa" # needed for kinfo_getvmmap(3) in libutil.h LIBS=3D"-lutil $LIBS" @@ -813,14 +813,14 @@ FreeBSD) DragonFly) bsd=3D"yes" make=3D"${MAKE-gmake}" - audio_drv_list=3D"oss" + audio_drv_list=3D"oss try-sdl" audio_possible_drivers=3D"oss sdl pa" HOST_VARIANT_DIR=3D"dragonfly" ;; NetBSD) bsd=3D"yes" make=3D"${MAKE-gmake}" - audio_drv_list=3D"oss" + audio_drv_list=3D"oss try-sdl" audio_possible_drivers=3D"oss sdl" oss_lib=3D"-lossaudio" HOST_VARIANT_DIR=3D"netbsd" @@ -845,7 +845,7 @@ Darwin) LDFLAGS=3D"-arch x86_64 $LDFLAGS" fi cocoa=3D"yes" - audio_drv_list=3D"coreaudio" + audio_drv_list=3D"coreaudio try-sdl" audio_possible_drivers=3D"coreaudio sdl" LDFLAGS=3D"-framework CoreFoundation -framework IOKit $LDFLAGS" libs_softmmu=3D"-F/System/Library/Frameworks -framework Cocoa -framework= IOKit $libs_softmmu" @@ -861,7 +861,7 @@ SunOS) install=3D"${INSTALL-ginstall}" smbd=3D"${SMBD-/usr/sfw/sbin/smbd}" if test -f /usr/include/sys/soundcard.h ; then - audio_drv_list=3D"oss" + audio_drv_list=3D"oss try-sdl" fi audio_possible_drivers=3D"oss sdl" # needed for CMSG_ macros in sys/socket.h @@ -879,7 +879,7 @@ Haiku) LIBS=3D"-lposix_error_mapper -lnetwork $LIBS" ;; Linux) - audio_drv_list=3D"oss" + audio_drv_list=3D"try-pa try-alsa try-sdl oss" audio_possible_drivers=3D"oss alsa sdl pa" linux=3D"yes" linux_user=3D"yes" --=20 2.9.3