From patchwork Mon Aug 26 19:59:01 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: 1153430 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="gA1XtM/J"; 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 46HNDr192Kz9sPH for ; Tue, 27 Aug 2019 06:01:31 +1000 (AEST) Received: from localhost ([::1]:57316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2LBA-0005kd-OM for incoming@patchwork.ozlabs.org; Mon, 26 Aug 2019 16:01:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47122) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2L8v-0004qH-C5 for qemu-devel@nongnu.org; Mon, 26 Aug 2019 15:59:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2L8u-0000jK-C3 for qemu-devel@nongnu.org; Mon, 26 Aug 2019 15:59:09 -0400 Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]:39363) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i2L8u-0000iv-8D for qemu-devel@nongnu.org; Mon, 26 Aug 2019 15:59:08 -0400 Received: by mail-qt1-x842.google.com with SMTP id l9so19143524qtu.6 for ; Mon, 26 Aug 2019 12:59:08 -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=yftoTHEZncMaes6MKHaraCxxOc0UbFsAz6f8Z9AKcbY=; b=gA1XtM/JyQge0lffTmzAl5AVbGjBGarmtMs/JqCH3gFv/Onxp5aTN2UxFn/3IuTzo7 B7qndKdJOrAb7aghNkEoXiq+Wtuff4aaNbsh5O0sLOF7IrApeDyGo0VYmVk2Rz3dSF0r bQi8O9eXUVFz0a6ZhDlhGWAdhF7ak8k6zGVWk3xcK8a/hw9jSFclfl+6Dv8SGJVByXDG fZtD4i25XHIKE7tuvVAPeKKexNjQccJWJFA7uE35ByFpaRybxxItWWAEmw3wp1luXZ8i efCfXWNFF2ceHlS+HNgHVokTF6JnykbQYs8E4VbatTWWym6fUhge0GMoZb0Tjo/iWm+m DeDw== 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=yftoTHEZncMaes6MKHaraCxxOc0UbFsAz6f8Z9AKcbY=; b=UjLQFoyNdN7WuY3vYzvWsY53EklEGtfxxCA7Tayxe996mIgPd+KYyOmWKY9eQWJBjX NvO1CcSzh5hQNiyk+xABlC6UaIcMxgNBrmBc86iqAOzvucQQxkmLEI2xSUUOMq7Cl7EW rZErQi7F0xLIa/pZy/U0P4XAFR00gISigtE+AdJBLHJ0efxu7C9f36EgPyih76BHBLHS C2Jr8/4rVyNLoxNOTZNSAnaz43U92qsNM92YPeFZ1HIkkPY8ngQfun4n69AoSebtojfo x7jF6+kmZq1GDD6qGdKsix7No8EmuFj8lIzJj8BznEdV4O/SIR3Rv6dBKJchgz5F2lSU xgJg== X-Gm-Message-State: APjAAAUs0SVM831noobWxVL/MHKh432Uc55ijKYwxRCO4jgEfTL9Otdw yNIyRSD5SileEojC3j6kVndh4VhxbAQ= X-Google-Smtp-Source: APXvYqzq156ZtY69l0bAfOcoVoDskG/sNLBCo8Q3K/TNH0DeIjWXHS5Kaol2CkRzXlsQ3ul25LgNKQ== X-Received: by 2002:aed:2fe6:: with SMTP id m93mr19492384qtd.114.1566849547548; Mon, 26 Aug 2019 12:59:07 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-61b1-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:61b1::5]) by smtp.gmail.com with ESMTPSA id v7sm6795459qte.86.2019.08.26.12.59.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Aug 2019 12:59:07 -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 21:59:01 +0200 Message-Id: <7808bc816ba7da8b8de8a214713444d85f7af3c6.1566847960.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: 2607:f8b0:4864:20::842 Subject: [Qemu-devel] [PATCH v2 1/4] audio: fix invalid malloc size in audio_create_pdos 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" The code used sizeof(AudiodevAlsaPerDirectionOptions) instead of the appropriate per direction options for the audio backend. If the size of the actual audiodev's per direction options are larger than alsa's, it could cause a buffer overflow. However, alsa has three fields in per direction options: a string, an uint32 and a bool. Oss has the same fields, coreaudio has a single uint32, paaudio has a string and an uint32, all other backends only use the common options, so currently no per direction options struct should be larger than alsa's. Signed-off-by: Kővágó, Zoltán --- audio/audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/audio.c b/audio/audio.c index 7d715332c9..ae335dbebb 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1685,7 +1685,7 @@ void audio_create_pdos(Audiodev *dev) } \ if (!dev->u.driver.has_out) { \ dev->u.driver.out = g_malloc0( \ - sizeof(AudiodevAlsaPerDirectionOptions)); \ + sizeof(Audiodev##pdo_name##PerDirectionOptions)); \ dev->u.driver.has_out = true; \ } \ break From patchwork Mon Aug 26 19:59:02 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: 1153428 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="eshfaByV"; 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 46HNCC4vDrz9sNk for ; Tue, 27 Aug 2019 06:00:07 +1000 (AEST) Received: from localhost ([::1]:57310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2L9p-0004wU-1D for incoming@patchwork.ozlabs.org; Mon, 26 Aug 2019 16:00:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47133) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2L8w-0004rU-IH for qemu-devel@nongnu.org; Mon, 26 Aug 2019 15:59:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2L8v-0000k1-GY for qemu-devel@nongnu.org; Mon, 26 Aug 2019 15:59:10 -0400 Received: from mail-qk1-x741.google.com ([2607:f8b0:4864:20::741]:33257) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i2L8v-0000je-Ce for qemu-devel@nongnu.org; Mon, 26 Aug 2019 15:59:09 -0400 Received: by mail-qk1-x741.google.com with SMTP id w18so15153254qki.0 for ; Mon, 26 Aug 2019 12:59:09 -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=6vKc3KTMZLJZZmLzgCK03pmr6FwqF+2WsP7Qm1coCZg=; b=eshfaByV1dIgN+qbK35LY1YTWu5xITDr3OHBbFH/liNXxAnAh9kHbnj7llbgi8lbLj BrfE+171JvnoAdOaAps6gWh5sGHnA/XZpC4CIV6wjGmaLaknOqRRqbCNsJlfQzSi0I7f YyugO8PeIjYuVtuvj/5WY1cuEliRZZ+m8gP3xFvZaVgnu85emGsqIo8yjSAQ9zvdFnMI 3cwKjB8R7iuwqc0QvsBjE/UiVoMp4CYeEa45Wk8P1HE11xfLL64ia96a8LZhHle1ze7x 6mczqY+FYdis0PttDSuyisFq6+TQ/7wXq72jFAJ7rVPWk1lVNpk/WPBsYYz5vzt1QnDU PaKg== 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=6vKc3KTMZLJZZmLzgCK03pmr6FwqF+2WsP7Qm1coCZg=; b=TLb+r9zWD+dNOAm3BcazdBSlVqoljeomLKSBd6/ZngZ1r+M7rY3UZWjvOAR5AmuXwG yXklO6SGzbiKMysAq6g9RQUilCRUHBrI4OV7Y6Nas/LCdwGP3eV2nGtSaG9uClZY3/BL Ai2Om5lSYkCiBRKYrkewXxAxs79QLv5QK4m6/SBh3/l+dc1VomlhXP+293bpgZ0e39zN eqZ/Wc4Za39DQrRyRlSm4oDQkDpNWrmm+LD1sNTPUDznVHnx8Gp3vMZ5T4dW0gttslf5 byUrbJFx01PeDLTmplDuoDN9gPz3kGEcOi8HHYvoEZlGARkyb7UgUODNfMca7PHymt6p Zpug== X-Gm-Message-State: APjAAAUloKKt3oHyQMcQNUue/IBwbVBekxmG1dC/kk/YOKAe6H2vWenx Hlf7VA1Q7MIHNs/TlMvB1oeqt74UaVA= X-Google-Smtp-Source: APXvYqzaa22kZgnGLnDf+9v+3B1MLg0bzLxg1ecnhqVcmQmh9sM4VyJAqMwYZ/ky0KNQTzUVLSAkTw== X-Received: by 2002:a05:620a:137b:: with SMTP id d27mr18842173qkl.161.1566849548777; Mon, 26 Aug 2019 12:59:08 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-61b1-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:61b1::5]) by smtp.gmail.com with ESMTPSA id v7sm6795459qte.86.2019.08.26.12.59.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Aug 2019 12:59:08 -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 21:59:02 +0200 Message-Id: <02d4328c33455742d01e0b62395013e95293c3ba.1566847960.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: 2607:f8b0:4864:20::741 Subject: [Qemu-devel] [PATCH v2 2/4] 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 ae335dbebb..e99fcd0694 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 19:59:03 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: 1153431 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="L3/CHfOt"; 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 46HNJR3h0gz9s7T for ; Tue, 27 Aug 2019 06:04:38 +1000 (AEST) Received: from localhost ([::1]:57352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2LEB-0000kG-7o for incoming@patchwork.ozlabs.org; Mon, 26 Aug 2019 16:04:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47144) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2L8x-0004sx-JH for qemu-devel@nongnu.org; Mon, 26 Aug 2019 15:59:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2L8w-0000kk-L3 for qemu-devel@nongnu.org; Mon, 26 Aug 2019 15:59:11 -0400 Received: from mail-qk1-x741.google.com ([2607:f8b0:4864:20::741]:46053) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i2L8w-0000ka-HM for qemu-devel@nongnu.org; Mon, 26 Aug 2019 15:59:10 -0400 Received: by mail-qk1-x741.google.com with SMTP id m2so15095708qki.12 for ; Mon, 26 Aug 2019 12:59:10 -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=ZOgPcO45w+lAd8b5mAaLnclR6mwgfXcXmo8jMMQhxfA=; b=L3/CHfOt8zgMPb93Ex2QfdJ+MiVLU1UxfH1qqA8z8C5/5Xr706RvoY1w9e3CHQhqk1 IBjlvsz2DioOTBoJAKR+zRuQ/X8ytfPXtsYttyvHVqXIQhXjW5cLWrCvKZLym5XsnrVA mljtVPCDwFdpuRH0uVU1X/AeabGzXbon4RDEqEMeX14JELYquNGCgi4nUlu8o9kwKbO9 o4X+km2YgW/stjnYXVoEF7BC1MZuavY25ghc2/+64nq/gsiUQfwMp/uZBaqjexCcWlSL XEpyrt9kY2I/R1YLVOFLHPs7M+G8jhxTCjeHLby2rifoR2Bsn4bppL63lPhi4XmXIR74 4Brg== 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=ZOgPcO45w+lAd8b5mAaLnclR6mwgfXcXmo8jMMQhxfA=; b=troovqYq+9LD7T1LIQmJmcWq2poSKl0oTj3Sf2xJHVcBPJDbOu3VCwF8jyD5iZhtz3 FYXUHym5O0dUtOaavNEV4Rr1ZcLCE0tcfoHkHYMQzuejHpqwvvRR8z7TFXschr51c8G4 SzBFuUY2/aV/FnOcrLRwYEgQ0lARvoSEW+T1AXeLV/Sun8CuHtWnph87pBeNO2Fq5SnV uy/Wcb3txsp+l4rSS9fdbWqjneWwf0GUfK0kHU0vOa8SPh+diT4omI3Zbh70cj+keD7j npynCIH+dttodsaZxr0iYuZNGlCKIhBezC3Iiz+lxY1NqcfJUKEQfwXEe+rWlRU/Dh28 Wu+w== X-Gm-Message-State: APjAAAXW/mJ738QzApWl0diZPEnn1fMW7Z+GyF+Nd0oW5xs+/vmLhr6U ojt4nEpQpmV2t8r6hvXXttrSz1RQTx0= X-Google-Smtp-Source: APXvYqyKXFCAch8fa4tAO5RdzHHmb1+iSHa6/gwPpvaP2/ZoSVBzXUx8EOMRxKdjkza1F3HfiPhSOw== X-Received: by 2002:a05:620a:7c8:: with SMTP id 8mr17335619qkb.424.1566849550046; Mon, 26 Aug 2019 12:59:10 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-61b1-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:61b1::5]) by smtp.gmail.com with ESMTPSA id v7sm6795459qte.86.2019.08.26.12.59.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Aug 2019 12:59:09 -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 21:59:03 +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: 2607:f8b0:4864:20::741 Subject: [Qemu-devel] [PATCH v2 3/4] 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 19:59:04 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: 1153427 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="D+fOjlIe"; 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 46HNCB1ZFVz9sNF for ; Tue, 27 Aug 2019 06:00:06 +1000 (AEST) Received: from localhost ([::1]:57312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2L9n-0004yb-Fe for incoming@patchwork.ozlabs.org; Mon, 26 Aug 2019 16:00:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47155) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2L8z-0004vJ-5d for qemu-devel@nongnu.org; Mon, 26 Aug 2019 15:59:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2L8y-0000lV-3s for qemu-devel@nongnu.org; Mon, 26 Aug 2019 15:59:13 -0400 Received: from mail-qk1-x743.google.com ([2607:f8b0:4864:20::743]:34714) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i2L8x-0000lI-WD for qemu-devel@nongnu.org; Mon, 26 Aug 2019 15:59:12 -0400 Received: by mail-qk1-x743.google.com with SMTP id m10so15125801qkk.1 for ; Mon, 26 Aug 2019 12:59:11 -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=ySokALVusjzAmJ3tB5VFUmu77Hw7Lnlmsc5ORnFHP8A=; b=D+fOjlIezy9+fjM3Cqvo66ZjSq/zVkiLsMnDeY9YNcYg2KuT0z0PrADoQynUIJDFB5 Wvd5R6aPY5c5Z0D+K6j0n04t2JU46wedb64I1Wb5+GHty8rH5TInVtYdq8CpDNspEaga Xx7vaiebrm604bgTxizd4o6awLVG+aFqjKrI2o7Lk2ihvRbi8ZxzMFsUBnkmZKDHdf7O GXNIXsNGWXptHrqYOT5jNSRr/Z+JEMk/idchgW6LUQ0CTmKWKd7GZdsb47qmZo5XzTOg XCxNjguveTbg7gR58BJi+5Bxzk7qC8Phrb0p1evyCoF8eCIhuUmWip9Yi5OF9Nz8Q9Kd wtMw== 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=ySokALVusjzAmJ3tB5VFUmu77Hw7Lnlmsc5ORnFHP8A=; b=D6YtCbcMXMFJ3w1p6Cnyt7arPSjQ2+FV4qBl5jfJ/s8fLAsPKMeIIVLCHBG4iQ7K1g eRMxG8S9ioZy7G76qIgBc8Av2ahymH3uUvD61AWr0zv7BFbmC5KzZBwKczYdzUVzf+yz ZEkrugPywsp8ygCiJOPWG69AwqrVNrdxg/MLVD6YK6tqsLcBLXXoajycwtoMzGetZXLA YSbSSXSY6Jxmje0ZfhZj271kMd4sA6zXZuPGq0wBsmYh4jxM+CHOfUx4fml4lw7+lAZ2 GJMTMgulLRG8FSUtopRAPaXyMaCxrUHuWwaoJO/OUnodCTIbvPAMzZdpOGLnEikLjOrS wi9g== X-Gm-Message-State: APjAAAWSE/RaaenKBi29VI3pEIxACAEgXVRoe3+jC9KW5F32hzvhnswe ASy2OYSaZ6eUqPpzEIm74vLOPgzLdNc= X-Google-Smtp-Source: APXvYqzxGj4mWY++l6Nanz89PuP3eyoMxG8rOpU2SLE6fZzdEgRa3wgRzUiNERFIXAZhsWHF3i0Icw== X-Received: by 2002:a05:620a:1355:: with SMTP id c21mr17076321qkl.97.1566849551426; Mon, 26 Aug 2019 12:59:11 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-61b1-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:61b1::5]) by smtp.gmail.com with ESMTPSA id v7sm6795459qte.86.2019.08.26.12.59.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Aug 2019 12:59:11 -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 21:59:04 +0200 Message-Id: <43076a2afeb0439b607b0631e0bfff77d55bc0cc.1566847960.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: 2607:f8b0:4864:20::743 Subject: [Qemu-devel] [PATCH v2 4/4] 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,