[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/7] numa: Rename option parsing functions
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 6/7] numa: Rename option parsing functions |
Date: |
Mon, 23 Feb 2015 16:29:13 -0300 |
Renaming set_numa_nodes() and numa_init_func() to parse_numa_opts() and
parse_numa() makes the purpose of those functions clearer.
Reviewed-by: Paolo Bonzini <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
include/sysemu/numa.h | 2 +-
numa.c | 6 +++---
vl.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h
index d25ada9..453b49a 100644
--- a/include/sysemu/numa.h
+++ b/include/sysemu/numa.h
@@ -16,7 +16,7 @@ typedef struct node_info {
bool present;
} NodeInfo;
extern NodeInfo numa_info[MAX_NODES];
-void set_numa_nodes(void);
+void parse_numa_opts(void);
void set_numa_modes(void);
void query_numa_node_mem(uint64_t node_mem[]);
extern QemuOptsList qemu_numa_opts;
diff --git a/numa.c b/numa.c
index eb9259b..d5b95e1 100644
--- a/numa.c
+++ b/numa.c
@@ -123,7 +123,7 @@ static void numa_node_parse(NumaNodeOptions *node, QemuOpts
*opts, Error **errp)
max_numa_nodeid = MAX(max_numa_nodeid, nodenr + 1);
}
-static int numa_init_func(QemuOpts *opts, void *opaque)
+static int parse_numa(QemuOpts *opts, void *opaque)
{
NumaOptions *object = NULL;
Error *err = NULL;
@@ -166,11 +166,11 @@ error:
return -1;
}
-void set_numa_nodes(void)
+void parse_numa_opts(void)
{
int i;
- if (qemu_opts_foreach(qemu_find_opts("numa"), numa_init_func,
+ if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa,
NULL, 1) != 0) {
exit(1);
}
diff --git a/vl.c b/vl.c
index 6db7724..a71f015 100644
--- a/vl.c
+++ b/vl.c
@@ -4157,7 +4157,7 @@ int main(int argc, char **argv, char **envp)
default_drive(default_floppy, snapshot, IF_FLOPPY, 0, FD_OPTS);
default_drive(default_sdcard, snapshot, IF_SD, 0, SD_OPTS);
- set_numa_nodes();
+ parse_numa_opts();
if (qemu_opts_foreach(qemu_find_opts("mon"), mon_init_func, NULL, 1) != 0)
{
exit(1);
--
2.1.0
- [Qemu-devel] [PULL 0/7] NUMA queue, Eduardo Habkost, 2015/02/23
- [Qemu-devel] [PULL 2/7] vl.c: Remove unnecessary zero-initialization of NUMA globals, Eduardo Habkost, 2015/02/23
- [Qemu-devel] [PULL 3/7] numa: Move NUMA globals to numa.c, Eduardo Habkost, 2015/02/23
- [Qemu-devel] [PULL 4/7] numa: Make max_numa_nodeid static, Eduardo Habkost, 2015/02/23
- [Qemu-devel] [PULL 1/7] numa: Move NUMA declarations from sysemu.h to numa.h, Eduardo Habkost, 2015/02/23
- [Qemu-devel] [PULL 6/7] numa: Rename option parsing functions,
Eduardo Habkost <=
- [Qemu-devel] [PULL 5/7] numa: Move QemuOpts parsing to set_numa_nodes(), Eduardo Habkost, 2015/02/23
- [Qemu-devel] [PULL 7/7] numa: Rename set_numa_modes() to numa_post_machine_init(), Eduardo Habkost, 2015/02/23