From nobody Sun Nov 24 17:02:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1722568868; cv=none; d=zohomail.com; s=zohoarc; b=jYoMuiQQfUAicsQJphaf+l1QhIaAqcQzgk2PX/vDMVD+cjyPAs/thjBeiLwCfSF06XOHKstQf4Rt9X+JBOk01ZWup//eSkdWLpZE0jgAF44m7k2PxGjVKjLvQXKC/6SkJuBDuapFhpgTVi3mv6bcAZhlMEzeoTyolkDizrov9jI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1722568868; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=AnZaL0zp9IvvGokEEaSQs7FqBYwJkhZko8nE8QpANLI=; b=edTbEu2eqVHGs77KXveluaDTB7e5QgzTR6gJbKvAGukTWrlthgpzZ2soY/n21x6Sk1Waz/T0NQi8nisJqnec7WQCiWvXbwI8/A98vnqw0atdzewtmJvjpy/gizJr0SzqnbdmlsmDqW6ADXGbX8t297t5n+vFC0Lbv/AZPdzbv9M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1722568868161347.40728194659596; Thu, 1 Aug 2024 20:21:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sZiqI-0006b8-RZ; Thu, 01 Aug 2024 23:20:34 -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 1sZiqG-0006E5-9d for qemu-devel@nongnu.org; Thu, 01 Aug 2024 23:20:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sZiq8-0000GQ-P0 for qemu-devel@nongnu.org; Thu, 01 Aug 2024 23:20:27 -0400 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-642-Cndk9v5KPiKDXFAjIHywfw-1; Thu, 01 Aug 2024 23:20:20 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EF6641955D52; Fri, 2 Aug 2024 03:20:15 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.229]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CEE54300018D; Fri, 2 Aug 2024 03:20:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722568824; 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=AnZaL0zp9IvvGokEEaSQs7FqBYwJkhZko8nE8QpANLI=; b=UvCWsrAR7mcqOWcwi4n0iXyYGG7EzxJJAnoOGhgHeHAofPrHVfjReUXpbFx5ZALDWDfBRv lyV0i/PPcu3zbGZ8mCfg2f4xYZ8gLVLn3qwDaKpq8bTxPZpfR6FrJCjM0iFwqreG4K770j gkJ2GQ1FHjeUABcTD7NKboYPp5YKwsc= X-MC-Unique: Cndk9v5KPiKDXFAjIHywfw-1 From: Jason Wang To: qemu-devel@nongnu.org Cc: David Woodhouse , qemu-stable@nongnu.org, Michael Tokarev , Jason Wang Subject: [PULL 8/8] net: Reinstate '-net nic, model=help' output as documented in man page Date: Fri, 2 Aug 2024 11:19:29 +0800 Message-ID: <20240802031929.44060-9-jasowang@redhat.com> In-Reply-To: <20240802031929.44060-1-jasowang@redhat.com> References: <20240802031929.44060-1-jasowang@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.131, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1722568868888116601 Content-Type: text/plain; charset="utf-8" From: David Woodhouse While refactoring the NIC initialization code, I broke '-net nic,model=3Dhe= lp' which no longer outputs a list of available NIC models. Fixes: 2cdeca04adab ("net: report list of available models according to pla= tform") Cc: qemu-stable@nongnu.org Signed-off-by: David Woodhouse Reviewed-by: Michael Tokarev Signed-off-by: Jason Wang --- net/net.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/net/net.c b/net/net.c index 6938da05e0..2eb8bc9c0b 100644 --- a/net/net.c +++ b/net/net.c @@ -1139,6 +1139,21 @@ NICInfo *qemu_find_nic_info(const char *typename, bo= ol match_default, return NULL; } =20 +static bool is_nic_model_help_option(const char *model) +{ + if (model && is_help_option(model)) { + /* + * Trigger the help output by instantiating the hash table which + * will gather tha available models as they get registered. + */ + if (!nic_model_help) { + nic_model_help =3D g_hash_table_new_full(g_str_hash, g_str_equ= al, + g_free, NULL); + } + return true; + } + return false; +} =20 /* "I have created a device. Please configure it if you can" */ bool qemu_configure_nic_device(DeviceState *dev, bool match_default, @@ -1722,6 +1737,12 @@ void net_check_clients(void) =20 static int net_init_client(void *dummy, QemuOpts *opts, Error **errp) { + const char *model =3D qemu_opt_get_del(opts, "model"); + + if (is_nic_model_help_option(model)) { + return 0; + } + return net_client_init(opts, false, errp); } =20 @@ -1778,9 +1799,7 @@ static int net_param_nic(void *dummy, QemuOpts *opts,= Error **errp) memset(ni, 0, sizeof(*ni)); ni->model =3D qemu_opt_get_del(opts, "model"); =20 - if (!nic_model_help && !g_strcmp0(ni->model, "help")) { - nic_model_help =3D g_hash_table_new_full(g_str_hash, g_str_equal, - g_free, NULL); + if (is_nic_model_help_option(ni->model)) { return 0; } =20 --=20 2.42.0