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); }