From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C4205C47DDB for ; Fri, 26 Jan 2024 16:50:45 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTPP5-0005Vp-4l; Fri, 26 Jan 2024 11:50:07 -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 1rTPP3-0005Uf-JY for qemu-devel@nongnu.org; Fri, 26 Jan 2024 11:50:05 -0500 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 1rTPP0-0007gx-JE for qemu-devel@nongnu.org; Fri, 26 Jan 2024 11:50:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706287802; 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:autocrypt:autocrypt; bh=0KfPDhHPOVpc4yilmMGil/qgHhNOxNfCayRNOJMvDwY=; b=NGjdOSxb8SPzD7pvlDjt1vsA2QMNfbLPCvdE+L5glBYBSmsvgjK0MWq7hH8cYalCCl4S9U Q5fex5IEpa6UQNZ8P6igtiOH7jgVQGKf3Gtlw0M7ekEE3R2g2+pA027T+IgjdTQX9t59ls QY1iIOwDzuCN/hvhS+OmGBuYcSyFv/c= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-208-zyeVAHwCPVipKb9K4q_46g-1; Fri, 26 Jan 2024 11:50:00 -0500 X-MC-Unique: zyeVAHwCPVipKb9K4q_46g-1 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-783163c7c38so70773785a.2 for ; Fri, 26 Jan 2024 08:49:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706287799; x=1706892599; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:cc :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0KfPDhHPOVpc4yilmMGil/qgHhNOxNfCayRNOJMvDwY=; b=p7WSpgJeFWLJ+CZ4UQhQOHcFdfMH16fKQxqAbjYxhDlYuywUIUkEyXvSpgdOhNJTX+ JiwI5AOH4XXR8EpHSF14AbaCIF5llaBZY1uYnu2aod9qqF1CCuulQCtTM59D3uweeyZ6 z1I9yzH8+9MBTxcGti6CtcqFeF/rk58Mkhrz4H7cwo9Y7jd2v5niLBeyzzqE2cMfH8QJ yNNY3TX+EbmDTqLuNPDUKtZIxwq5fWKmRlG4txYRNKgoZH2P0TOssbTbP6+XNPS1ZJ53 d8NRxh+KCUWmr32Suv2gVula/x/XOv1Jg4HWIHT2b8mcVG1o7URVEqGDfBsJ3+8tM7cd rR7g== X-Gm-Message-State: AOJu0Yzls9tUVfg+5i3UJfTmAZLqSzhoHelg0CCLUJUyWQrF90iZX1hs P/glTN5cden6r8IDXwg8Yvih5pd+g/6A6//9VkC8xsw9EIXw8fKldLMKzYkF71E/Qsv6NZpDhMw F6bQGQEcEE+ANFFCrGAFX5sluM7Kr/4CEix+fNCG9+lQmQVUuU2rv X-Received: by 2002:a05:620a:5319:b0:783:3457:a7e5 with SMTP id oo25-20020a05620a531900b007833457a7e5mr14904qkn.53.1706287799495; Fri, 26 Jan 2024 08:49:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IGphXDzpKcGUhfOPCNP0TPTVgL1hvzGVl/NturbUf/gHks7ulSbCd9UwbjzXETYsqnWuMLKTg== X-Received: by 2002:a05:620a:5319:b0:783:3457:a7e5 with SMTP id oo25-20020a05620a531900b007833457a7e5mr14862qkn.53.1706287799171; Fri, 26 Jan 2024 08:49:59 -0800 (PST) Received: from [192.168.0.9] (ip-109-43-176-119.web.vodafone.de. [109.43.176.119]) by smtp.gmail.com with ESMTPSA id w1-20020a05620a148100b0078322b61e88sm712978qkj.78.2024.01.26.08.49.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 26 Jan 2024 08:49:58 -0800 (PST) Message-ID: <580501eb-e6e2-49d7-8b12-667f4a24d260@redhat.com> Date: Fri, 26 Jan 2024 17:49:43 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 45/46] net: remove qemu_show_nic_models(), qemu_find_nic_model() Content-Language: en-US To: David Woodhouse , qemu-devel@nongnu.org Cc: Richard Henderson , Beniamino Galvani , Peter Maydell , Strahinja Jankovic , Niek Linnenbank , =?UTF-8?Q?C=C3=A9dric_Le_Goater?= , Andrew Jeffery , Joel Stanley , Igor Mitsyanko , Jean-Christophe Dubois , Andrey Smirnov , =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , Rob Herring , Subbaraya Sundeep , Jan Kiszka , Tyrone Ting , Hao Wu , Radoslaw Biernacki , Leif Lindholm , Marcin Juszkiewicz , "Edgar E. Iglesias" , Alistair Francis , Helge Deller , Paolo Bonzini , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Song Gao , Thomas Huth , Laurent Vivier , Huacai Chen , Jiaxun Yang , =?UTF-8?Q?Herv=C3=A9_Poussineau?= , Aleksandar Rikalo , Aurelien Jarno , Jason Wang , Jia Liu , Stafford Horne , Mark Cave-Ayland , Nicholas Piggin , Daniel Henrique Barboza , David Gibson , Harsh Prateek Bora , Bin Meng , Palmer Dabbelt , Weiwei Li , Liu Zhiwei , Halil Pasic , Christian Borntraeger , Eric Farman , David Hildenbrand , Ilya Leoshkevich , Yoshinori Sato , Magnus Damm , Artyom Tarasenko , Stefano Stabellini , Anthony Perard , Paul Durrant , Max Filippov , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-s390x@nongnu.org, xen-devel@lists.xenproject.org, David Woodhouse References: <20240108204909.564514-1-dwmw2@infradead.org> <20240108204909.564514-46-dwmw2@infradead.org> From: Thomas Huth Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <20240108204909.564514-46-dwmw2@infradead.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.313, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 08/01/2024 21.27, David Woodhouse wrote: > From: David Woodhouse > > These old functions can be removed now too. Let net_param_nic() print > the full set of network devices directly, and also make it note that a > list more specific to this platform/config will be available by using > '-nic model=help' instead. > > Signed-off-by: David Woodhouse > --- > include/net/net.h | 3 --- > net/net.c | 39 ++++++--------------------------------- > 2 files changed, 6 insertions(+), 36 deletions(-) > > diff --git a/include/net/net.h b/include/net/net.h > index 1be8b40074..19fb82833c 100644 > --- a/include/net/net.h > +++ b/include/net/net.h > @@ -203,9 +203,6 @@ void qemu_set_vnet_hdr_len(NetClientState *nc, int len); > int qemu_set_vnet_le(NetClientState *nc, bool is_le); > int qemu_set_vnet_be(NetClientState *nc, bool is_be); > void qemu_macaddr_default_if_unset(MACAddr *macaddr); > -int qemu_show_nic_models(const char *arg, const char *const *models); > -int qemu_find_nic_model(NICInfo *nd, const char * const *models, > - const char *default_model); > NICInfo *qemu_find_nic_info(const char *typename, bool match_default, > const char *alias); > bool qemu_configure_nic_device(DeviceState *dev, bool match_default, > diff --git a/net/net.c b/net/net.c > index ffd4b42d5a..09ab0889f5 100644 > --- a/net/net.c > +++ b/net/net.c > @@ -977,38 +977,6 @@ GPtrArray *qemu_get_nic_models(const char *device_type) > return nic_models; > } > > -int qemu_show_nic_models(const char *arg, const char *const *models) > -{ > - int i; > - > - if (!arg || !is_help_option(arg)) { > - return 0; > - } > - > - printf("Available NIC models:\n"); > - for (i = 0 ; models[i]; i++) { > - printf("%s\n", models[i]); > - } > - return 1; > -} > - > -int qemu_find_nic_model(NICInfo *nd, const char * const *models, > - const char *default_model) > -{ > - int i; > - > - if (!nd->model) > - nd->model = g_strdup(default_model); > - > - for (i = 0 ; models[i]; i++) { > - if (strcmp(nd->model, models[i]) == 0) > - return i; > - } > - > - error_report("Unsupported NIC model: %s", nd->model); > - return -1; > -} > - > static int net_init_nic(const Netdev *netdev, const char *name, > NetClientState *peer, Error **errp) > { > @@ -1791,9 +1759,14 @@ static int net_param_nic(void *dummy, QemuOpts *opts, Error **errp) > } > if (is_help_option(type)) { > GPtrArray *nic_models = qemu_get_nic_models(TYPE_DEVICE); > + int i; > show_netdevs(); > printf("\n"); > - qemu_show_nic_models(type, (const char **)nic_models->pdata); > + printf("Supported NIC models " Can we please keep "Available" instead of "Supported" ? ... since not each NIC is supported on each machine type... Thomas > + "(use -nic model=help for a filtered list):\n"); > + for (i = 0 ; nic_models->pdata[i]; i++) { > + printf("%s\n", (char *)nic_models->pdata[i]); > + } > g_ptr_array_free(nic_models, true); > exit(0); > }