diff options
| author | David Woodhouse <dwmw@amazon.co.uk> | 2023-10-23 09:38:01 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw@amazon.co.uk> | 2024-02-02 16:23:48 +0000 |
| commit | e8c5c4525cbbd7207c085732cfd1e67d8f3d662a (patch) | |
| tree | 0972de8341837ba78eefdb331ecda3c69124e0e7 | |
| parent | 481434f99e5293cadf0f056bef4afbbefd7b0bb3 (diff) | |
| download | focaccia-qemu-e8c5c4525cbbd7207c085732cfd1e67d8f3d662a.tar.gz focaccia-qemu-e8c5c4525cbbd7207c085732cfd1e67d8f3d662a.zip | |
net: make nb_nics and nd_table[] static in net/net.c
Also remove the stale declaration of host_net_devices; the actual
definition was removed long ago in commit 7cc28cb06104 ("net: Remove
the deprecated 'host_net_add' and 'host_net_remove' HMP commands")
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | include/net/net.h | 4 | ||||
| -rw-r--r-- | net/net.c | 3 | ||||
| -rw-r--r-- | system/globals.c | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/include/net/net.h b/include/net/net.h index 588ee55f28..b1f9b35fcc 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -301,10 +301,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 d705e9b0fd..a2f0c828bb 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; |