Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into...

[mirror_qemu.git] / include / sysemu / numa.h

diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h
index 7a0ae751aa7995d4fe5d972e74110cafe509372e..01a263eba2d69f8b5989e4c1519c843aea404ce3 100644 (file)
--- a/include/sysemu/numa.h
+++ b/include/sysemu/numa.h
@@ -9,7 +9,7 @@
 extern int nb_numa_nodes;   /* Number of NUMA nodes */
 extern bool have_numa_distance;
 
-struct node_info {
+struct NodeInfo {
     uint64_t node_mem;
     struct HostMemoryBackend *node_memdev;
     bool present;
@@ -22,7 +22,8 @@ struct NumaNodeMem {
 };
 
 extern NodeInfo numa_info[MAX_NODES];
-int parse_numa(void *opaque, QemuOpts *opts, Error **errp);
+
+void set_numa_options(MachineState *ms, NumaOptions *object, Error **errp);
 void parse_numa_opts(MachineState *ms);
 void numa_complete_configuration(MachineState *ms);
 void query_numa_node_mem(NumaNodeMem node_mem[]);