From patchwork Thu Sep 28 07:36:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1840602 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FJ5vqT3e; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rx52R4dtwz1yp0 for ; Thu, 28 Sep 2023 17:38:55 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qllae-0004o7-CP; Thu, 28 Sep 2023 03:37:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qllac-0004ng-G1 for qemu-devel@nongnu.org; Thu, 28 Sep 2023 03:37:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qllaZ-00069w-W0 for qemu-devel@nongnu.org; Thu, 28 Sep 2023 03:37:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695886655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sRcCfHHfRJZEoliXZknMt/jPGA2DXK7pmSmEe/5VPDM=; b=FJ5vqT3efgnBjXfXwq+81ap41Lpfm0YmF+MfyXfYyE3xShcLJ9FQGXtXHAfCZJrMCMw3gM 1oewInfqqYuPIxIrCXWZdhrTGwYk9+KLdbB9XaI3jvDBmHsRUYulm/k7wt/ftrgKPcXtRJ O6JtxEBs7fhg7cAsWp8C4LyMDePjmAM= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-507-eoVtasxJMLSlKwEj0L5uMA-1; Thu, 28 Sep 2023 03:37:34 -0400 X-MC-Unique: eoVtasxJMLSlKwEj0L5uMA-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-99c8bbc902eso1106722766b.1 for ; Thu, 28 Sep 2023 00:37:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695886653; x=1696491453; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sRcCfHHfRJZEoliXZknMt/jPGA2DXK7pmSmEe/5VPDM=; b=MOWsGP2AXNhI0wIyi6amN475aIB8/d6BzzY3hhHD5Jr5jgI/PZCq7pr/qwp9cMFPMq JmZG+Nh7YUy5E8TEexFJfWKp9pFEi7l1yj0qy0N743xrugccMK+owNozHOGmCDlFjkcE yettrG6zTM5CVzO/crqKC5XPhdphmDx/mHXR6nl8PZUTowYc7VZc725yHFkTG/F4H9xy iJ5Dce/VvrRk82+kwgX/FGgDQFnITmn418cfrEw+M+nEHOkTEevXfPfIDzOiLz2RJcp8 D8HYwWw6F2BAk1M7S5Wn1eqv8qzrJNu0uUuPQhVkw8k//LbFHUqEzmTqdIOgojtFdifH 2HgA== X-Gm-Message-State: AOJu0YxvxgBrORXhhC6/oNHjNF2vqPPuK+7CIRZgUeC8IEZqN/3UeZ9r B1UtoA5+eFZ6cR5cNs9S7suaHi0asd6voP4Fvp+nkurO99oOuRbvtnfQDGPFkSG4Sj5/SoDtz4n 08iyowf08CqX4sqymvRy/udPRBCyR2AIgV8GOjrNPilN3IsAegET9RUses6nxU2dHQrtPeiE7Z8 I= X-Received: by 2002:a17:906:68c9:b0:99c:75f7:19c1 with SMTP id y9-20020a17090668c900b0099c75f719c1mr449940ejr.39.1695886652807; Thu, 28 Sep 2023 00:37:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF1ZqtyyBCXpND/uF5eND/8DLDwjnobZY8RqAAhYi5qYUVKm/dxiWohYodb7i4GvUlTdLgD9Q== X-Received: by 2002:a17:906:68c9:b0:99c:75f7:19c1 with SMTP id y9-20020a17090668c900b0099c75f719c1mr449929ejr.39.1695886652575; Thu, 28 Sep 2023 00:37:32 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id mh2-20020a170906eb8200b0099cc3c7ace2sm10541733ejb.140.2023.09.28.00.37.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 00:37:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: berrange@redhat.com, balaton@eik.bme.hu Subject: [PATCH 13/13] audio: forbid default audiodev backend with -nodefaults Date: Thu, 28 Sep 2023 09:36:57 +0200 Message-ID: <20230928073705.871327-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230928073705.871327-1-pbonzini@redhat.com> References: <20230928073705.871327-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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 Now that all callers support setting an audiodev, forbid using the default audiodev if -nodefaults is provided on the command line. Signed-off-by: Paolo Bonzini --- audio/audio.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index bc837cb2ff2..868164373e1 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1806,10 +1806,12 @@ static AudioState *audio_init(Audiodev *dev) bool AUD_register_card (const char *name, QEMUSoundCard *card, Error **errp) { if (!card->state) { - if (!QSIMPLEQ_EMPTY(&audiodevs)) { + if (!QSIMPLEQ_EMPTY(&audiodevs) || !defaults_enabled()) { error_setg(errp, "No audiodev specified for %s", name); - error_append_hint(errp, "Perhaps you wanted to set audiodev=%s?", - QSIMPLEQ_FIRST(&audiodevs)->dev->id); + if (!QSIMPLEQ_EMPTY(&audiodevs)) { + error_append_hint(errp, "Perhaps you wanted to set audiodev=%s?", + QSIMPLEQ_FIRST(&audiodevs)->dev->id); + } return false; }