diff options
| author | Eduardo Habkost | 2015-02-08 19:51:20 +0100 |
|---|---|---|
| committer | Eduardo Habkost | 2015-02-23 19:39:27 +0100 |
| commit | 7dcd1d70fe2886a1e30d32678b795e6b9b6dd5c4 (patch) | |
| tree | 5af6a547cca0b0a82bb9400db3731bc18c84ab04 /numa.c | |
| parent | numa: Make max_numa_nodeid static (diff) | |
| download | qemu-7dcd1d70fe2886a1e30d32678b795e6b9b6dd5c4.tar.gz qemu-7dcd1d70fe2886a1e30d32678b795e6b9b6dd5c4.tar.xz qemu-7dcd1d70fe2886a1e30d32678b795e6b9b6dd5c4.zip | |
numa: Move QemuOpts parsing to set_numa_nodes()
This allows us to make numa_init_func() static.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'numa.c')
| -rw-r--r-- | numa.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -36,6 +36,8 @@ #include "sysemu/hostmem.h" #include "qmp-commands.h" #include "hw/mem/pc-dimm.h" +#include "qemu/option.h" +#include "qemu/config-file.h" QemuOptsList qemu_numa_opts = { .name = "numa", @@ -121,7 +123,7 @@ static void numa_node_parse(NumaNodeOptions *node, QemuOpts *opts, Error **errp) max_numa_nodeid = MAX(max_numa_nodeid, nodenr + 1); } -int numa_init_func(QemuOpts *opts, void *opaque) +static int numa_init_func(QemuOpts *opts, void *opaque) { NumaOptions *object = NULL; Error *err = NULL; @@ -168,6 +170,11 @@ void set_numa_nodes(void) { int i; + if (qemu_opts_foreach(qemu_find_opts("numa"), numa_init_func, + NULL, 1) != 0) { + exit(1); + } + assert(max_numa_nodeid <= MAX_NODES); /* No support for sparse NUMA node IDs yet: */ |