[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-8.3 v2 46/46] net: make nb_nics and nd_table[] static in net/
From: |
David Woodhouse |
Subject: |
[PATCH for-8.3 v2 46/46] net: make nb_nics and nd_table[] static in net/net.c |
Date: |
Mon, 6 Nov 2023 19:49:51 +0000 |
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
include/net/net.h | 4 ----
net/net.c | 3 +++
system/globals.c | 2 --
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/include/net/net.h b/include/net/net.h
index 290e604f03..5a38766942 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -245,10 +245,6 @@ struct NICInfo {
int nvectors;
};
-extern int nb_nics;
-extern NICInfo nd_table[MAX_NICS];
-extern const char *host_net_devices[];
-
/* from net.c */
extern NetClientStateList net_clients;
bool netdev_is_modern(const char *optstr);
diff --git a/net/net.c b/net/net.c
index a3532a71a5..957daad58d 100644
--- a/net/net.c
+++ b/net/net.c
@@ -77,6 +77,9 @@ static NetdevQueue nd_queue =
QSIMPLEQ_HEAD_INITIALIZER(nd_queue);
static GHashTable *nic_model_help;
+static int nb_nics;
+static NICInfo nd_table[MAX_NICS];
+
/***********************************************************/
/* network device redirectors */
diff --git a/system/globals.c b/system/globals.c
index e83b5428d1..b6d4e72530 100644
--- a/system/globals.c
+++ b/system/globals.c
@@ -36,8 +36,6 @@ int display_opengl;
const char* keyboard_layout;
bool enable_mlock;
bool enable_cpu_pm;
-int nb_nics;
-NICInfo nd_table[MAX_NICS];
int autostart = 1;
int vga_interface_type = VGA_NONE;
bool vga_interface_created;
--
2.41.0
- [PATCH for-8.3 v2 21/46] hw/arm/allwinner: use qemu_configure_nic_device(), (continued)
- [PATCH for-8.3 v2 21/46] hw/arm/allwinner: use qemu_configure_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 34/46] hw/microblaze: use qemu_configure_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 25/46] hw/net/smc91c111: use qemu_configure_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 26/46] hw/net/lan9118: use qemu_configure_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 03/46] net: add qemu_create_nic_bus_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 31/46] hw/net/etraxfs-eth: use qemu_configure_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 35/46] hw/mips/mipssim: use qemu_create_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 32/46] hw/m68k/mcf5208: use qemu_create_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 13/46] hw/mips/malta: use pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 37/46] hw/net/lasi_i82596: use qemu_configure_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 46/46] net: make nb_nics and nd_table[] static in net/net.c,
David Woodhouse <=
- [PATCH for-8.3 v2 12/46] hw/mips/fuloong2e: use pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 33/46] hw/m68k/q800: use qemu_find_nic_info(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 38/46] hw/openrisc/openrisc_sim: use qemu_create_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 11/46] hw/loongarch: use pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 36/46] hw/mips/jazz: use qemu_find_nic_info(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 02/46] net: report list of available models according to platform, David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 39/46] hw/riscv: use qemu_configure_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 45/46] net: remove qemu_show_nic_models(), qemu_find_nic_model(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 20/46] hw/xtensa/virt: use pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 22/46] hw/arm/aspeed: use qemu_configure_nic_device(), David Woodhouse, 2023/11/06