mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

numa: postpone options post-processing till machine_run_board_init()

Browse Source 
in preparation for numa options to being handled via QMP before
machine_run_board_init(), move final numa configuration checks
and processing to machine_run_board_init() so it could take into
account both CLI (via parse_numa_opts()) and QMP input

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1525423069-61903-2-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2018-05-04 10:37:39 +02:00 committed by Eduardo Habkost
parent 74f38e96b3
commit 7a3099fc9c
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/core/machine.c
View File

@ -737,7 +737,7 @@ static char *cpu_slot_to_string(const CPUArchId *cpu)
return g_string_free(s, false); return g_string_free(s, false);
} }
static void machine_numa_finish_init(MachineState *machine) static void machine_numa_finish_cpu_init(MachineState *machine)
{ {
int i; int i;
bool default_mapping; bool default_mapping;
@ -792,7 +792,8 @@ void machine_run_board_init(MachineState *machine)
MachineClass *machine_class = MACHINE_GET_CLASS(machine); MachineClass *machine_class = MACHINE_GET_CLASS(machine);
if (nb_numa_nodes) { if (nb_numa_nodes) {
machine_numa_finish_init(machine); numa_complete_configuration(machine);
machine_numa_finish_cpu_init(machine);
} }
/* If the machine supports the valid_cpu_types check and the user /* If the machine supports the valid_cpu_types check and the user

1
include/sysemu/numa.h
View File

@ -23,6 +23,7 @@ struct NumaNodeMem {
extern NodeInfo numa_info[MAX_NODES]; extern NodeInfo numa_info[MAX_NODES];
void parse_numa_opts(MachineState *ms); void parse_numa_opts(MachineState *ms);
void numa_complete_configuration(MachineState *ms);
void query_numa_node_mem(NumaNodeMem node_mem[]); void query_numa_node_mem(NumaNodeMem node_mem[]);
extern QemuOptsList qemu_numa_opts; extern QemuOptsList qemu_numa_opts;
void numa_legacy_auto_assign_ram(MachineClass *mc, NodeInfo *nodes, void numa_legacy_auto_assign_ram(MachineClass *mc, NodeInfo *nodes,

13
numa.c
View File

@ -338,15 +338,11 @@ void numa_default_auto_assign_ram(MachineClass *mc, NodeInfo *nodes,
nodes[i].node_mem = size - usedmem; nodes[i].node_mem = size - usedmem;
} }
void parse_numa_opts(MachineState *ms) void numa_complete_configuration(MachineState *ms)
{ {
int i; int i;
MachineClass *mc = MACHINE_GET_CLASS(ms); MachineClass *mc = MACHINE_GET_CLASS(ms);
if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, ms, NULL)) {
exit(1);
}
/* /*
* If memory hotplug is enabled (slots > 0) but without '-numa' * If memory hotplug is enabled (slots > 0) but without '-numa'
* options explicitly on CLI, guestes will break. * options explicitly on CLI, guestes will break.
@ -433,6 +429,13 @@ void parse_numa_opts(MachineState *ms)
} }
} }
void parse_numa_opts(MachineState *ms)
{
if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, ms, NULL)) {
exit(1);
}
}
void numa_cpu_pre_plug(const CPUArchId *slot, DeviceState *dev, Error **errp) void numa_cpu_pre_plug(const CPUArchId *slot, DeviceState *dev, Error **errp)
{ {
int node_id = object_property_get_int(OBJECT(dev), "node-id", &error_abort); int node_id = object_property_get_int(OBJECT(dev), "node-id", &error_abort);