From nobody Sat Sep 28 23:08:49 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 1548257148187953.3412175897076; Wed, 23 Jan 2019 07:25:48 -0800 (PST) Received: from localhost ([127.0.0.1]:36791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmKPT-0002WU-3p for importer@patchew.org; Wed, 23 Jan 2019 10:25:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmKLc-0008Gg-Rn for qemu-devel@nongnu.org; Wed, 23 Jan 2019 10:21:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmKLb-0008H3-Lj for qemu-devel@nongnu.org; Wed, 23 Jan 2019 10:21:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56176) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmKLZ-000873-Bs for qemu-devel@nongnu.org; Wed, 23 Jan 2019 10:21:45 -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 77FFDC076606; Wed, 23 Jan 2019 15:21:24 +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 CF7E81054FCC; Wed, 23 Jan 2019 15:21:18 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 6455D9AB3; Wed, 23 Jan 2019 16:21:12 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 23 Jan 2019 16:21:11 +0100 Message-Id: <20190123152112.15757-6-kraxel@redhat.com> In-Reply-To: <20190123152112.15757-1-kraxel@redhat.com> References: <20190123152112.15757-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]); Wed, 23 Jan 2019 15:21:24 +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 v2 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 --- audio/audio.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 1ace47f510..3e40ea9e5e 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, boo= l msg) { if (drv->options) { audio_process_options (drv->name, drv->options); @@ -1776,7 +1776,8 @@ 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 +1902,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 +1913,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