From patchwork Mon Aug 26 00:29:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 1152901 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DP2Ci/pA"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46GtDq0xgcz9sDB for ; Mon, 26 Aug 2019 10:29:45 +1000 (AEST) Received: from localhost ([::1]:48828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i22tB-0002UE-Md for incoming@patchwork.ozlabs.org; Sun, 25 Aug 2019 20:29:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48760) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i22sk-0002Tq-Tl for qemu-devel@nongnu.org; Sun, 25 Aug 2019 20:29:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i22sj-0001zS-TY for qemu-devel@nongnu.org; Sun, 25 Aug 2019 20:29:14 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:36663) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i22sj-0001yp-Nz for qemu-devel@nongnu.org; Sun, 25 Aug 2019 20:29:13 -0400 Received: by mail-wm1-x343.google.com with SMTP id g67so14123878wme.1 for ; Sun, 25 Aug 2019 17:29:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3SCYdPHixYiDa5hoVT0Tlp9GgfPbk+6aSz1nYbqKJJQ=; b=DP2Ci/pAQ7Upnz+VYcK/zHwMjQfsG67A1t5QEcaVSZvS5jYqG6Vr96367iK0S/Kai0 FKIvTcsngiQb+T0w5GeXxixTqxmTRm4B1/29xgmukkN8rBfqUIa0MLWU58F/8+1KlJTG 1qzFjo5t7IsKLcvW65z6aVyzs7/PYrvxC0K+7Cv+rxVAxDpq/o8H7mY0j3C2MsVlApzs nFpuXeCCU9xr7S9XxclAofPLFNaDLbRGGF8/NPnCqdSryYyvMPpLXfDcPG/c0dmgiFZB xlG18hW6tr1aMIxQ7eJLn5B4qpeyhdqXIOiWjGQA0aHuMtTLe6q0K/HjS/o1JGV9ryy+ Ji6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3SCYdPHixYiDa5hoVT0Tlp9GgfPbk+6aSz1nYbqKJJQ=; b=rUFdsbGqnZCoccJ92S0urNJDtmHKpvLlD6o5sgElSDskl6HmupHOxOjls0YN7dQuPy hMAy/vFkfh86yz5xIAjJZW2WyPH9DOuR2RaVACeoL2oAuwg9yZlWm1pYTL4+V3i5MU9B sjAR39hVhpKOkNMKMVLalXoj6b89qilTZAnO0m2DrbUCbzXXYBEQJCXoRaY/gSaMEWjz Okj11Lyh0h8QuNgVz0vZBhnSrOVK3ss9XylQquzZiguhrifsLUGYjwMudZAdFEUH3LFL dSuZPVfKR0wbFqIdNN6mmFHw+KKQCQdTahGo9tBojEVQbBnmE8knLWBJNbg+zSqmnRcc 8nig== X-Gm-Message-State: APjAAAUi6voHgTxwqfWRKETE0RkcHUTNnN1Rnpqd1byt/pFdOrXtqdip 2NdzubALy31d1r0xojIOELORwuirYtY= X-Google-Smtp-Source: APXvYqxTcLgcqvx6VaGC/xNB2xDSeEgY6v8IOoiPaGB1cn3+dfcXqi3DAkOaUvmmoSo5eHoddzTO6g== X-Received: by 2002:a05:600c:21ca:: with SMTP id x10mr18458075wmj.112.1566779352510; Sun, 25 Aug 2019 17:29:12 -0700 (PDT) Received: from decltype.home.dirty-ice.org (2a01-036c-0113-61b1-0001-0000-0000-00d3.pool6.digikabel.hu. [2a01:36c:113:61b1:1::d3]) by smtp.gmail.com with ESMTPSA id c19sm8662339wml.13.2019.08.25.17.29.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Aug 2019 17:29:12 -0700 (PDT) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?utf-8?b?S8WRdsOhZ8OzLCBab2x0w6Fu?= To: qemu-devel@nongnu.org Date: Mon, 26 Aug 2019 02:29:07 +0200 Message-Id: X-Mailer: git-send-email 2.22.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH 1/3] audio: omitting audiodev= parameter is only deprecated X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "reviewer:Incompatible changes" , Gerd Hoffmann , Maxim Levitsky Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Unfortunately, changes introduced in af2041ed2d "audio: audiodev= parameters no longer optional when -audiodev present" breaks backward compatibility. This patch changes the error into a deprecation warning. Signed-off-by: Kővágó, Zoltán --- qemu-deprecated.texi | 7 +++++++ audio/audio.c | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 00a4b6f350..9d74a1cfc0 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -72,6 +72,13 @@ backend settings instead of environment variables. To ease migration to the new format, the ``-audiodev-help'' option can be used to convert the current values of the environment variables to ``-audiodev'' options. +@subsection Creating sound card devices and vnc without audiodev= property (since 4.2) + +When not using the deprecated legacy audio config, each sound card +should specify an @code{audiodev=} property. Additionally, when using +vnc, you should specify an @code{audiodev=} propery if you plan to +transmit audio through the VNC protocol. + @subsection -mon ...,control=readline,pretty=on|off (since 4.1) The @code{pretty=on|off} switch has no effect for HMP monitors, but is diff --git a/audio/audio.c b/audio/audio.c index 7d715332c9..e13addf922 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1412,8 +1412,9 @@ static AudioState *audio_init(Audiodev *dev, const char *name) drvname = AudiodevDriver_str(dev->driver); } else if (!QTAILQ_EMPTY(&audio_states)) { if (!legacy_config) { - dolog("You must specify an audiodev= for the device %s\n", name); - exit(1); + dolog("Device %s: audiodev default parameter is deprecated, please " + "specify audiodev=%s\n", name, + QTAILQ_FIRST(&audio_states)->dev->id); } return QTAILQ_FIRST(&audio_states); } else { @@ -1548,8 +1549,7 @@ CaptureVoiceOut *AUD_add_capture( if (!s) { if (!legacy_config) { - dolog("You must specify audiodev when trying to capture\n"); - return NULL; + dolog("Capturing without setting an audiodev is deprecated\n"); } s = audio_init(NULL, NULL); } From patchwork Mon Aug 26 00:29:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 1152903 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XMVLUOAY"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46GtHn2DkRz9sDB for ; Mon, 26 Aug 2019 10:32:21 +1000 (AEST) Received: from localhost ([::1]:48846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i22vj-0004Qg-9U for incoming@patchwork.ozlabs.org; Sun, 25 Aug 2019 20:32:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48772) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i22sl-0002Tx-HE for qemu-devel@nongnu.org; Sun, 25 Aug 2019 20:29:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i22sk-0001zy-My for qemu-devel@nongnu.org; Sun, 25 Aug 2019 20:29:15 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:36229) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i22sk-0001zW-HZ for qemu-devel@nongnu.org; Sun, 25 Aug 2019 20:29:14 -0400 Received: by mail-wr1-x443.google.com with SMTP id r3so13610770wrt.3 for ; Sun, 25 Aug 2019 17:29:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nlX7+gWJb2MeKaswtkvAtP/+mrv1fy++rHT+GxAY3UY=; b=XMVLUOAYp62/AYRsga04gl1thR68AdNRN6m2cDnk8G6Ve2IlM85OUfAxKPluMd4exP WWkC7PDMTlIfmaSlTmGbbQfm7SskEiopE9EuEsQU5dIPLCDuqd4+yaefLFzW37uaUHwB KWCSqMLnPP8ukNuZqb4yhOFn3oE1X9A6iLR3UO+Ul2Eb3jNHeQ2codI1qEOdOS4F0GYO 1Dy/kKsvPm9u1ri5WsHI7d2v6XtyMnjmpdZlJjzW4QpwvRXT+kYXC/QGAidYDHJNuDTP vodk+b4+rw7rDC27ysc6dK3Atfd/rwBwrilARJddY3s65reqtmFW3aqLhyOV9fUQxtxm zUpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nlX7+gWJb2MeKaswtkvAtP/+mrv1fy++rHT+GxAY3UY=; b=Jc/OhYLMbcqA3gEyQWef1U6hM7QsA+xRUiMYK8IAgIywpltZ7L0C7jDuk4qt3r3wQF J0LSuwYvYLQQ8Evumhuj4oglOWIv89zFij0haTd3FRcoejqgoCRbBKP+T0SvlJJP0oIq vK0e3bAAXXcDpm/PCIPX/2bhSh/r9UMcqB4F4r0cWup5ZoGMOVPyh00yPQo8HXl5EXIX F/tF+x2dHtYwQ4pRA1W8LW1gkA68PI2X2EfyAHTNr+uZVtKwYloS/VRXmuds4edYDSmJ B75YBs3SjHycuVSckfmkjzkvsFprljR+vU2bxpOHoci0Ftyi0GciFZq807Kyq70+6Clu z4Mw== X-Gm-Message-State: APjAAAXQQsERMlnEx+0adregkIrXT4Qzc5QO75x4Cc15LcldcIClR+Ir k2Sjym06sf5qik1iW9gCWWMe5XFV/Pw= X-Google-Smtp-Source: APXvYqyRp4czrHdINCoTm+BaSXKP0KqZ4mvwT54stAjqeIbbTVDlQHWL0NwTNp11GXCKGucgH1qtGg== X-Received: by 2002:adf:8364:: with SMTP id 91mr18615855wrd.13.1566779353446; Sun, 25 Aug 2019 17:29:13 -0700 (PDT) Received: from decltype.home.dirty-ice.org (2a01-036c-0113-61b1-0001-0000-0000-00d3.pool6.digikabel.hu. [2a01:36c:113:61b1:1::d3]) by smtp.gmail.com with ESMTPSA id c19sm8662339wml.13.2019.08.25.17.29.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Aug 2019 17:29:13 -0700 (PDT) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?utf-8?b?S8WRdsOhZ8OzLCBab2x0w6Fu?= To: qemu-devel@nongnu.org Date: Mon, 26 Aug 2019 02:29:08 +0200 Message-Id: <9db7233c490836c221bab463305d08e34db9f037.1566779143.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH 2/3] audio: paaudio: fix client name X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Maxim Levitsky Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" pa_context_new expects a client name, not a server socket path. Signed-off-by: Kővágó, Zoltán Reviewed-by: Maxim Levitsky --- audio/paaudio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/paaudio.c b/audio/paaudio.c index bfef9acaad..777b8e4718 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -866,7 +866,7 @@ static void *qpa_conn_init(const char *server) } c->context = pa_context_new(pa_threaded_mainloop_get_api(c->mainloop), - server); + "qemu"); if (!c->context) { goto fail; } From patchwork Mon Aug 26 00:29:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 1152904 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X3LE/T/Y"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46GtK61cwDz9sN4 for ; Mon, 26 Aug 2019 10:33:30 +1000 (AEST) Received: from localhost ([::1]:48856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i22wq-0005Jm-5Y for incoming@patchwork.ozlabs.org; Sun, 25 Aug 2019 20:33:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48788) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i22sm-0002UF-Tz for qemu-devel@nongnu.org; Sun, 25 Aug 2019 20:29:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i22sl-00021L-TE for qemu-devel@nongnu.org; Sun, 25 Aug 2019 20:29:16 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:40674) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i22sl-00020J-Nh for qemu-devel@nongnu.org; Sun, 25 Aug 2019 20:29:15 -0400 Received: by mail-wm1-x342.google.com with SMTP id c5so13927346wmb.5 for ; Sun, 25 Aug 2019 17:29:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kzgx2650E0fVXX9zEvy6QLqOBlzWHa5+1jbkOPeTG2o=; b=X3LE/T/Y1k/8LVPIz/GohuMKAx45ghAfZbU5yXV+ZSXqSno7pvh+tFl6DmnoLS2wmr NHmg0iW2BUc4oe8ZaSu7P8uOS2dey2rVks/RKqc05uguIHy+8RN+JeNjKfI1C7iMX3cg eF/5CsNSufgYWsInYiG+Hja5/NiQr4JAv3JEznJjEB4MUR/P5qPgeOeDRgZKx5iq/3Mw vVi9FoKnmMXu5nJUtLF+LTScVA2cQe6flBzq7TGFINn36vwJgcDi2Mdzc3lo4MC1PCtQ D4uxWvWYg/n8uLcAoUpx7iJDPvRU/KNVgPjFS8GC/olrksdHXZeoweWD6c3mSf3PiHMA LouA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kzgx2650E0fVXX9zEvy6QLqOBlzWHa5+1jbkOPeTG2o=; b=a4974qUhmTXoZePWdTM9nUBgS5mtHq7wovPERxQrTWODGa07NFbtKZdyXc4G9Q26v6 gQaQplVN+3NMpuXRcw6MDaSZJ0mQbCngxcSbVIT1TsSzRAQpJoYbshU2qAIqxP4HCVG4 pjSbHqU6Q019eoLjJDzh18TKcVuv+Tutf7fH84xH8sYEXtVgwUlyJCQTnxJnrZdvkmNJ SRJ8V41t3bzYraEgHI/UMDgOup19M1K9vPHgx7olO13Lz+FsOurXn4i/u8w3kPfT0Z8q Z4DCPvLHHpUuXpjELVJ9PKB5TKsBv6NMCHiufbmIFIosPVXCzpAIZdGHVqGbILRzT9SS 2gCA== X-Gm-Message-State: APjAAAV09wUj+iQWkJ3OXCxgQGhXdzFSBiDnFRI6gc+DMrkHJdaTnZ6A Za9N2RtMG3h8swvAR+nRmeNnNLReB1A= X-Google-Smtp-Source: APXvYqxCrdClo0IEeC5gKB/BMDsKgv5CDVKqv9tK53F2pKp1NHOCb1mN56HplDplcKUwuX9d0ZfeQA== X-Received: by 2002:a1c:804b:: with SMTP id b72mr18103789wmd.139.1566779354532; Sun, 25 Aug 2019 17:29:14 -0700 (PDT) Received: from decltype.home.dirty-ice.org (2a01-036c-0113-61b1-0001-0000-0000-00d3.pool6.digikabel.hu. [2a01:36c:113:61b1:1::d3]) by smtp.gmail.com with ESMTPSA id c19sm8662339wml.13.2019.08.25.17.29.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Aug 2019 17:29:14 -0700 (PDT) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?utf-8?b?S8WRdsOhZ8OzLCBab2x0w6Fu?= To: qemu-devel@nongnu.org Date: Mon, 26 Aug 2019 02:29:09 +0200 Message-Id: <5206082e64b6d7b9194e9076180399e5c5183650.1566779143.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH 3/3] audio: paaudio: ability to specify stream name X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Gerd Hoffmann , Maxim Levitsky Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This can be used to identify stream in tools like pavucontrol when one creates multiple -audiodevs or runs multiple qemu instances. Signed-off-by: Kővágó, Zoltán Reviewed-by: Maxim Levitsky --- qapi/audio.json | 6 ++++++ audio/paaudio.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/qapi/audio.json b/qapi/audio.json index 9fefdf5186..a433b3c9d7 100644 --- a/qapi/audio.json +++ b/qapi/audio.json @@ -206,6 +206,11 @@ # # @name: name of the sink/source to use # +# @stream-name: name of the PulseAudio stream created by qemu. Can be +# used to identify the stream in PulseAudio when you +# create multiple PulseAudio devices or run multiple qemu +# instances (default "qemu", since 4.2) +# # @latency: latency you want PulseAudio to achieve in microseconds # (default 15000) # @@ -215,6 +220,7 @@ 'base': 'AudiodevPerDirectionOptions', 'data': { '*name': 'str', + '*stream-name': 'str', '*latency': 'uint32' } } ## diff --git a/audio/paaudio.c b/audio/paaudio.c index 777b8e4718..827f442b6e 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -562,7 +562,7 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsettings *as, pa->stream = qpa_simple_new ( c, - "qemu", + ppdo->has_stream_name ? ppdo->stream_name : "qemu", PA_STREAM_PLAYBACK, ppdo->has_name ? ppdo->name : NULL, &ss, @@ -630,7 +630,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) pa->stream = qpa_simple_new ( c, - "qemu", + ppdo->has_stream_name ? ppdo->stream_name : "qemu", PA_STREAM_RECORD, ppdo->has_name ? ppdo->name : NULL, &ss,