Skip to content

Commit

Permalink
net: make nb_nics and nd_table[] static in net/net.c
Browse files Browse the repository at this point in the history
Also remove the stale declaration of host_net_devices; the actual
definition was removed long ago in commit 7cc28cb ("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>
  • Loading branch information
dwmw2 committed Feb 2, 2024
1 parent 481434f commit e8c5c45
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
4 changes: 0 additions & 4 deletions include/net/net.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions net/net.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
2 changes: 0 additions & 2 deletions system/globals.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e8c5c45

Please sign in to comment.