Re: [PATCH v3 46/46] net: make nb_nics and nd_table[] static in net/net.c

[Thomas Huth]

On 08/01/2024 21.27, David Woodhouse wrote:
From: David Woodhouse <d...@amazon.co.uk>

Please add: "Also remove the leftover definition of host_net_devices which 
has been forgotten to be removed in commit 7cc28cb061040cb089." (or so)

With that:
Reviewed-by: Thomas Huth <th...@redhat.com>



Signed-off-by: David Woodhouse <d...@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 19fb82833c..766201c62c 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -247,10 +247,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 09ab0889f5..71cccb19da 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;