numa: postpone options post-processing till machine_run_board_init()

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

View file

@ -737,7 +737,7 @@ static char *cpu_slot_to_string(const CPUArchId *cpu)
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;
bool default_mapping;
@ -792,7 +792,8 @@ void machine_run_board_init(MachineState *machine)
MachineClass *machine_class = MACHINE_GET_CLASS(machine);
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