From nobody Sat Sep 28 23:02:01 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 1548257396626348.9276663580529; Wed, 23 Jan 2019 07:29:56 -0800 (PST) Received: from localhost ([127.0.0.1]:36835 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmKTQ-0005ln-84 for importer@patchew.org; Wed, 23 Jan 2019 10:29:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmKLh-0008JC-Mk for qemu-devel@nongnu.org; Wed, 23 Jan 2019 10:21:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmKLe-0008K6-9g for qemu-devel@nongnu.org; Wed, 23 Jan 2019 10:21:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58422) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmKLe-00086F-0A for qemu-devel@nongnu.org; Wed, 23 Jan 2019 10:21:50 -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 D1B0BC05D3EC; Wed, 23 Jan 2019 15:21:22 +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 121724519; Wed, 23 Jan 2019 15:21:13 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 5C8F29AB2; Wed, 23 Jan 2019 16:21:12 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 23 Jan 2019 16:21:10 +0100 Message-Id: <20190123152112.15757-5-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.23 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:22 +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 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 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/audio/paaudio.c b/audio/paaudio.c index 4c100bc318..3c5cae8851 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -814,6 +814,19 @@ 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