From nobody Tue May 13 15:32:46 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675318933; cv=none; d=zohomail.com; s=zohoarc; b=UwFJ12crZ90M+aP291R3fLncDNhNi/jIdECEZjoKvUK80crwoEk4y91nFAzV9R8qYCr4fT1FQu3kCQqHdgxeTeV/vUwrfIus/28IT5U8kMDiRtL0JfblYvwLOmLJ19Cw1G73etZ9wcqGkYqpdS/+SAIxxRK2hsYz7A2nQpHRcP0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675318933; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=44+Q+1WsrAdzEQnwhO6pt4RZpDnxjNtVyovH3zpiJbk=; b=EMVj34Q/8mas11Jjx8UWL6yoAfOguA1wXNBI/EFkEa4c8Nl6RKfs2o+Xn2xGVRnwB6C8eJ8Sf9OVxlIGHPxlK9SM4zTbMCt0eNMiYQc6XLQLUNGmW/cKer7cG8xhrlvJRmwWN2BYICOWswy2TI6PJhJDGqIbmlTHMAES7IEHYII= 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+importer2=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 1675318933655429.1724626576256; Wed, 1 Feb 2023 22:22:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNSye-0005kq-Hw; Thu, 02 Feb 2023 01:21:44 -0500 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 1pNSyc-0005jh-GD for qemu-devel@nongnu.org; Thu, 02 Feb 2023 01:21:42 -0500 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 1pNSya-0006dO-W7 for qemu-devel@nongnu.org; Thu, 02 Feb 2023 01:21:42 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-449-hXSlEkktPwC1Ej5pPaslww-1; Thu, 02 Feb 2023 01:21:36 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E6FDE101A52E; Thu, 2 Feb 2023 06:21:35 +0000 (UTC) Received: from localhost.localdomain (ovpn-14-0.pek2.redhat.com [10.72.14.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id 161ED404BEC0; Thu, 2 Feb 2023 06:21:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675318899; 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=44+Q+1WsrAdzEQnwhO6pt4RZpDnxjNtVyovH3zpiJbk=; b=I6tBBAlWXuxOQe/cE4aduH6r3p8Y8BV2yvWT1wzgko/tx9J/vFraYbU03tiw3JrbK9nYMn eR2xbhBp5fRkhMUG7GG9hkUF1BOoYg4S1XmJ7MvybaF2ut4fatPPoCY40rlggDj2+X3FPE RzXpXORj1ExpYn5e9RF9nkYoNkZAXq4= X-MC-Unique: hXSlEkktPwC1Ej5pPaslww-1 From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: Thomas Huth , Jason Wang Subject: [PULL 02/11] net: Restore printing of the help text with "-nic help" Date: Thu, 2 Feb 2023 14:21:17 +0800 Message-Id: <20230202062126.67550-3-jasowang@redhat.com> In-Reply-To: <20230202062126.67550-1-jasowang@redhat.com> References: <20230202062126.67550-1-jasowang@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jasowang@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_H2=-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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675318935051100005 Content-Type: text/plain; charset="utf-8" From: Thomas Huth Running QEMU with "-nic help" used to work in QEMU 5.2 and earlier versions (it showed the available netdev backends), but this feature got broken duri= ng some refactoring in version 6.0. Let's restore the old behavior, and while we're at it, let's also print the available NIC models here now since this option can be used to configure both, netdev backend and model in one go. Fixes: ad6f932fe8 ("net: do not exit on "netdev_add help" monitor command") Signed-off-by: Thomas Huth Signed-off-by: Jason Wang --- net/net.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/net/net.c b/net/net.c index 8f083cf..888986a 100644 --- a/net/net.c +++ b/net/net.c @@ -1568,8 +1568,18 @@ static int net_param_nic(void *dummy, QemuOpts *opts= , Error **errp) const char *type; =20 type =3D qemu_opt_get(opts, "type"); - if (type && g_str_equal(type, "none")) { - return 0; /* Nothing to do, default_net is cleared in vl.c */ + if (type) { + if (g_str_equal(type, "none")) { + return 0; /* Nothing to do, default_net is cleared in vl.c = */ + } + if (is_help_option(type)) { + GPtrArray *nic_models =3D qemu_get_nic_models(TYPE_DEVICE); + show_netdevs(); + printf("\n"); + qemu_show_nic_models(type, (const char **)nic_models->pdata); + g_ptr_array_free(nic_models, true); + exit(0); + } } =20 idx =3D nic_get_free_idx(); --=20 2.7.4