From patchwork Fri Aug 21 15:37:22 2015 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: 509543 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BB6C81402C8 for ; Sat, 22 Aug 2015 01:52:21 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=O6Gn7ghe; dkim-atps=neutral Received: from localhost ([::1]:42255 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSoc7-0006wQ-V4 for incoming@patchwork.ozlabs.org; Fri, 21 Aug 2015 11:52:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSoON-0002is-W8 for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:38:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZSoOI-00027Y-0f for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:38:07 -0400 Received: from mail-wi0-x22b.google.com ([2a00:1450:400c:c05::22b]:34880) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSoOH-00027S-R2 for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:38:01 -0400 Received: by wicne3 with SMTP id ne3so19123355wic.0 for ; Fri, 21 Aug 2015 08:38:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=wnV8U7nOp1EilX8SKR15sdMtcHMvLce8XIIThFurHEQ=; b=O6Gn7ghehPtw3PTfKzs4CFddzCwfJ0AT5aZSIg0uJ/7lPWECZ/zCPwA+JP/V4vU75E beHDXFeZj+U3lfy7SBfnJbwb7WE66VQdYwZp3ZcQyM9cAWA83zsKjfh7VKZB0KQn/0XI TXIf+3iG3sYItiJa/7lX0ciG5sTwnDzm4E+cCGbAMttANZcSQ5OUuiC0iUzMPAzUwFYR LwEY9wQTI/0tsiaknTKlQnkUFq8Cas/xRc4qVGg6OnplQp9SvvyoaABWoAkFSt6+OnEd Lpb8chAkAy+piTJdD8gf/Ca23kotSwIuWtcO/SLIPkF2OmovYeUn7GEerLk70zWq1jqe 9nrQ== X-Received: by 10.194.79.225 with SMTP id m1mr16788193wjx.8.1440171481289; Fri, 21 Aug 2015 08:38:01 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (178-164-172-216.pool.digikabel.hu. [178.164.172.216]) by smtp.gmail.com with ESMTPSA id v8sm10479895wjr.15.2015.08.21.08.38.00 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Aug 2015 08:38:00 -0700 (PDT) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= To: qemu-devel@nongnu.org Date: Fri, 21 Aug 2015 17:37:22 +0200 Message-Id: X-Mailer: git-send-email 2.5.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::22b Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v2 26/49] audio: audiodev= parameters no longer optional when -audiodev present X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Reviewed-by: Marc-André Lureau Signed-off-by: Kővágó, Zoltán --- Changes from v1: * (probably) more clear error messages audio/audio.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 88e04bf..d7e0533 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -69,6 +69,8 @@ const struct mixeng_volume nominal_volume = { #endif }; +static bool legacy_config; + #ifdef AUDIO_IS_FLAWLESS_AND_NO_CHECKS_ARE_REQURIED #error No its not #else @@ -1318,7 +1320,7 @@ static Audiodev *parse_option(QemuOpts *opts, Error **errp); * initialize a new state with it * if dev == NULL => legacy implicit initialization, return the already created * state or create a new one */ -static AudioState *audio_init(Audiodev *dev) +static AudioState *audio_init(Audiodev *dev, const char *name) { static bool atexit_registered; size_t i; @@ -1332,9 +1334,13 @@ static AudioState *audio_init(Audiodev *dev) if (dev) { drvname = AudiodevDriver_lookup[dev->kind]; } else if (!QTAILQ_EMPTY(&audio_states)) { - /* todo: chack for -audiodev we have normal audiodev selection support */ + if (!legacy_config) { + dolog("You must specify an audiodev= for the device %s\n", name); + exit(1); + } return QTAILQ_FIRST(&audio_states); } else { + legacy_config = true; audio_handle_legacy_opts(); list = qemu_find_opts("audiodev"); dev = parse_option(QTAILQ_FIRST(&list->head), &error_abort); @@ -1440,7 +1446,7 @@ static AudioState *audio_init(Audiodev *dev) void AUD_register_card (const char *name, QEMUSoundCard *card) { if (!card->state) { - card->state = audio_init(NULL); + card->state = audio_init(NULL, name); } card->name = g_strdup (name); @@ -1466,7 +1472,10 @@ CaptureVoiceOut *AUD_add_capture( struct capture_callback *cb; if (!s) { - /* todo: remove when we have normal audiodev selection support */ + if (!legacy_config) { + dolog("You must specify audiodev when trying to capture\n"); + goto err0; + } s = QTAILQ_FIRST(&audio_states); } @@ -1705,7 +1714,7 @@ static int each_option(void *opaque, QemuOpts *opts, Error **errp) if (!dev) { return -1; } - return audio_init(dev) ? 0 : -1; + return audio_init(dev, NULL) ? 0 : -1; } void audio_set_options(void)