numa: Move NUMA globals to numa.c

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

diff --git a/numa.c b/numa.c
index 40f3d36472e6db0fd1da250a65818dd343929276..61531db5a1e7c6ea8ab182365e4ffe8b67b9c083 100644 (file)
--- a/numa.c
+++ b/numa.c
@@ -45,6 +45,9 @@ QemuOptsList qemu_numa_opts = {
 };
 
 static int have_memdevs = -1;
+int nb_numa_nodes;
+int max_numa_nodeid;
+NodeInfo numa_info[MAX_NODES];
 
 static void numa_node_parse(NumaNodeOptions *node, QemuOpts *opts, Error **errp)
 {

diff --git a/vl.c b/vl.c
index 52a49d93b86932fca856d98784c6f8ad7cb72017..52e9f2cacd0ea0d82d39a927496c4009c7e1deef 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -184,10 +184,6 @@ uint8_t qemu_extra_params_fw[2];
 
 int icount_align_option;
 
-int nb_numa_nodes;
-int max_numa_nodeid;
-NodeInfo numa_info[MAX_NODES];
-
 /* The bytes in qemu_uuid[] are in the order specified by RFC4122, _not_ in the
  * little-endian "wire format" described in the SMBIOS 2.6 specification.
  */