| [Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
 [PATCH v3 43/46] net: remove qemu_check_nic_model()
 
To: qemu-devel@xxxxxxxxxxFrom: David Woodhouse <dwmw2@xxxxxxxxxxxxx>Date: Mon,  8 Jan 2024 20:27:12 +0000Cc: Richard Henderson <richard.henderson@xxxxxxxxxx>,	Beniamino Galvani <b.galvani@xxxxxxxxx>,	Peter Maydell <peter.maydell@xxxxxxxxxx>,	Strahinja Jankovic <strahinja.p.jankovic@xxxxxxxxx>,	Niek Linnenbank <nieklinnenbank@xxxxxxxxx>,	Cédric Le Goater <clg@xxxxxxxx>,	Andrew Jeffery <andrew@xxxxxxxxxxxxxxxxxxxx>,	Joel Stanley <joel@xxxxxxxxx>,	Igor Mitsyanko <i.mitsyanko@xxxxxxxxx>,	Jean-Christophe Dubois <jcd@xxxxxxxxxxxxxxx>,	Andrey Smirnov <andrew.smirnov@xxxxxxxxx>,	Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>,	Rob Herring <robh@xxxxxxxxxx>,	Subbaraya Sundeep <sundeep.lkml@xxxxxxxxx>,	Jan Kiszka <jan.kiszka@xxxxxx>,	Tyrone Ting <kfting@xxxxxxxxxxx>,	Hao Wu <wuhaotsh@xxxxxxxxxx>,	Radoslaw Biernacki <rad@xxxxxxxxxxxx>,	Leif Lindholm <quic_llindhol@xxxxxxxxxxx>,	Marcin Juszkiewicz <marcin.juszkiewicz@xxxxxxxxxx>,	"Edgar E. Iglesias" <edgar.iglesias@xxxxxxxxx>,	Alistair Francis <alistair@xxxxxxxxxxxxx>,	Helge Deller <deller@xxxxxx>,	Paolo Bonzini <pbonzini@xxxxxxxxxx>,	Eduardo Habkost <eduardo@xxxxxxxxxxx>,	"Michael S. Tsirkin" <mst@xxxxxxxxxx>,	Marcel Apfelbaum <marcel.apfelbaum@xxxxxxxxx>,	Song Gao <gaosong@xxxxxxxxxxx>,	Thomas Huth <huth@xxxxxxxxxxxxx>,	Laurent Vivier <laurent@xxxxxxxxx>,	Huacai Chen <chenhuacai@xxxxxxxxxx>,	Jiaxun Yang <jiaxun.yang@xxxxxxxxxxx>,	Hervé Poussineau <hpoussin@xxxxxxxxxxx>,	Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxxx>,	Aurelien Jarno <aurelien@xxxxxxxxxxx>,	Jason Wang <jasowang@xxxxxxxxxx>,	Jia Liu <proljc@xxxxxxxxx>,	Stafford Horne <shorne@xxxxxxxxx>,	Mark Cave-Ayland <mark.cave-ayland@xxxxxxxxxxxx>,	Nicholas Piggin <npiggin@xxxxxxxxx>,	Daniel Henrique Barboza <danielhb413@xxxxxxxxx>,	David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>,	Harsh Prateek Bora <harshpb@xxxxxxxxxxxxx>,	Bin Meng <bin.meng@xxxxxxxxxxxxx>,	Palmer Dabbelt <palmer@xxxxxxxxxxx>,	Weiwei Li <liwei1518@xxxxxxxxx>,	Liu Zhiwei <zhiwei_liu@xxxxxxxxxxxxxxxxx>,	Halil Pasic <pasic@xxxxxxxxxxxxx>,	Christian Borntraeger <borntraeger@xxxxxxxxxxxxx>,	Eric Farman <farman@xxxxxxxxxxxxx>,	David Hildenbrand <david@xxxxxxxxxx>,	Ilya Leoshkevich <iii@xxxxxxxxxxxxx>,	Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>,	Magnus Damm <magnus.damm@xxxxxxxxx>,	Artyom Tarasenko <atar4qemu@xxxxxxxxx>,	Stefano Stabellini <sstabellini@xxxxxxxxxx>,	Anthony Perard <anthony.perard@xxxxxxxxxx>,	Paul Durrant <paul@xxxxxxx>,	Max Filippov <jcmvbkbc@xxxxxxxxx>,	qemu-arm@xxxxxxxxxx,	qemu-ppc@xxxxxxxxxx,	qemu-riscv@xxxxxxxxxx,	qemu-s390x@xxxxxxxxxx,	xen-devel@xxxxxxxxxxxxxxxxxxxx,	David Woodhouse <dwmw@xxxxxxxxxxxx>Delivery-date: Mon, 08 Jan 2024 20:51:09 +0000List-id: Xen developer discussion <xen-devel.lists.xenproject.org> 
 From: David Woodhouse <dwmw@xxxxxxxxxxxx>
Signed-off-by: David Woodhouse <dwmw@xxxxxxxxxxxx>
---
 include/net/net.h |  1 -
 net/net.c         | 13 -------------
 2 files changed, 14 deletions(-)
diff --git a/include/net/net.h b/include/net/net.h
index 31e63d1f0d..1be8b40074 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -204,7 +204,6 @@ 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);
-void qemu_check_nic_model(NICInfo *nd, const char *model);
 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,
diff --git a/net/net.c b/net/net.c
index 4651b3f443..ffd4b42d5a 100644
--- a/net/net.c
+++ b/net/net.c
@@ -992,19 +992,6 @@ int qemu_show_nic_models(const char *arg, const char 
*const *models)
     return 1;
 }
 
-void qemu_check_nic_model(NICInfo *nd, const char *model)
-{
-    const char *models[2];
-
-    models[0] = model;
-    models[1] = NULL;
-
-    if (qemu_show_nic_models(nd->model, models))
-        exit(0);
-    if (qemu_find_nic_model(nd, models, model) < 0)
-        exit(1);
-}
-
 int qemu_find_nic_model(NICInfo *nd, const char * const *models,
                         const char *default_model)
 {
-- 
2.41.0
 |