From nobody Sat Sep 28 23:00:52 2024 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 15483289875091010.4729096538299; Thu, 24 Jan 2019 03:23:07 -0800 (PST) Received: from localhost ([127.0.0.1]:51693 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmd63-00035I-BY for importer@patchew.org; Thu, 24 Jan 2019 06:22:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmd4D-0001yD-G7 for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmd49-000500-Qy for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52400) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmd49-0004xg-Lr for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:01 -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 E75EDC07013D; Thu, 24 Jan 2019 11:21:00 +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 9C24B1F8; Thu, 24 Jan 2019 11:20:56 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E1D531FCD6; Thu, 24 Jan 2019 12:20:55 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 24 Jan 2019 12:20:50 +0100 Message-Id: <20190124112055.547-2-kraxel@redhat.com> In-Reply-To: <20190124112055.547-1-kraxel@redhat.com> References: <20190124112055.547-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.31]); Thu, 24 Jan 2019 11:21:00 +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] [PATCH v3 1/6] 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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" Use pkg-config to probe for alsa and pulseaudio. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 Sat Sep 28 23:00:52 2024 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 1548329000543121.35370435952825; Thu, 24 Jan 2019 03:23:20 -0800 (PST) Received: from localhost ([127.0.0.1]:51699 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmd6M-0003Ky-FO for importer@patchew.org; Thu, 24 Jan 2019 06:23:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmd4B-0001wy-OT for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmd4A-00051A-RM for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52912) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmd4A-00050K-Kz for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:02 -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 D3360C07456A; Thu, 24 Jan 2019 11:21:01 +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 974BF1001F3D; Thu, 24 Jan 2019 11:20:56 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E9D921FCD9; Thu, 24 Jan 2019 12:20:55 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 24 Jan 2019 12:20:51 +0100 Message-Id: <20190124112055.547-3-kraxel@redhat.com> In-Reply-To: <20190124112055.547-1-kraxel@redhat.com> References: <20190124112055.547-1-kraxel@redhat.com> 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.32]); Thu, 24 Jan 2019 11:21:01 +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] [PATCH v3 2/6] 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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 --- 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 Sat Sep 28 23:00:52 2024 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 154832918756695.03217723179739; Thu, 24 Jan 2019 03:26:27 -0800 (PST) Received: from localhost ([127.0.0.1]:51775 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmd9O-0006Aq-L6 for importer@patchew.org; Thu, 24 Jan 2019 06:26:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51670) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmd4G-00021D-H7 for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmd4A-00051G-S1 for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58320) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmd4A-00050L-M4 for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:02 -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 E1BBF2CD80F; Thu, 24 Jan 2019 11:21:01 +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 9D95A261A8; Thu, 24 Jan 2019 11:20:56 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id F1ECD31EEB; Thu, 24 Jan 2019 12:20:55 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 24 Jan 2019 12:20:52 +0100 Message-Id: <20190124112055.547-4-kraxel@redhat.com> In-Reply-To: <20190124112055.547-1-kraxel@redhat.com> References: <20190124112055.547-1-kraxel@redhat.com> 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.29]); Thu, 24 Jan 2019 11:21:01 +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] [PATCH v3 3/6] 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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 --- 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 Sat Sep 28 23:00:52 2024 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548329112229139.04883609075205; Thu, 24 Jan 2019 03:25:12 -0800 (PST) Received: from localhost ([127.0.0.1]:51722 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmd86-00058t-1Y for importer@patchew.org; Thu, 24 Jan 2019 06:25:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51628) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmd4C-0001xE-Bm for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmd4A-00050y-Mz for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58312) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmd4A-00050G-HL for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:02 -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 C65CC2CD7EF; Thu, 24 Jan 2019 11:21:01 +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 A42321001F4D; Thu, 24 Jan 2019 11:20:56 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 05F5831F14; Thu, 24 Jan 2019 12:20:56 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 24 Jan 2019 12:20:53 +0100 Message-Id: <20190124112055.547-5-kraxel@redhat.com> In-Reply-To: <20190124112055.547-1-kraxel@redhat.com> References: <20190124112055.547-1-kraxel@redhat.com> 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.29]); Thu, 24 Jan 2019 11:21:01 +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] [PATCH v3 4/6] 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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 --- 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 Sat Sep 28 23:00:52 2024 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548329118699282.58771729594855; Thu, 24 Jan 2019 03:25:18 -0800 (PST) Received: from localhost ([127.0.0.1]:51724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmd8C-0005DN-MU for importer@patchew.org; Thu, 24 Jan 2019 06:25:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmd4L-00024o-O9 for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmd4G-00058R-5z for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:14990) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmd4G-00056l-0a for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:08 -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 3FBD014403F; Thu, 24 Jan 2019 11:21:07 +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 CB24B60BF6; Thu, 24 Jan 2019 11:21:01 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0DEB54F971; Thu, 24 Jan 2019 12:20:56 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 24 Jan 2019 12:20:54 +0100 Message-Id: <20190124112055.547-6-kraxel@redhat.com> In-Reply-To: <20190124112055.547-1-kraxel@redhat.com> References: <20190124112055.547-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.38]); Thu, 24 Jan 2019 11:21:07 +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] [PATCH v3 5/6] 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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" 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 --- 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 Sat Sep 28 23:00:52 2024 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548328990957474.4391279145101; Thu, 24 Jan 2019 03:23:10 -0800 (PST) Received: from localhost ([127.0.0.1]:51695 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmd68-00039b-OL for importer@patchew.org; Thu, 24 Jan 2019 06:23:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmd4B-0001x2-Vt for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmd4B-00051m-71 for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22480) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmd4B-00050d-1g for qemu-devel@nongnu.org; Thu, 24 Jan 2019 06:21:03 -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 3D96D2D4B57; Thu, 24 Jan 2019 11:21:02 +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 C9F8E1F8; Thu, 24 Jan 2019 11:21:01 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 15D724F972; Thu, 24 Jan 2019 12:20:56 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 24 Jan 2019 12:20:55 +0100 Message-Id: <20190124112055.547-7-kraxel@redhat.com> In-Reply-To: <20190124112055.547-1-kraxel@redhat.com> References: <20190124112055.547-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.29]); Thu, 24 Jan 2019 11:21:02 +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] [PATCH v3 6/6] 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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 --- 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