Commit 7a3099fc authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

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: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <1525423069-61903-2-git-send-email-imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 74f38e96

hw/core/machine.c

+3 −2
Original line number Diff line number Diff line
@@ -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

include/sysemu/numa.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ struct NumaNodeMem { 


extern NodeInfo numa_info[MAX_NODES];

void parse_numa_opts(MachineState *ms);

void numa_complete_configuration(MachineState *ms);

void query_numa_node_mem(NumaNodeMem node_mem[]);

extern QemuOptsList qemu_numa_opts;

void numa_legacy_auto_assign_ram(MachineClass *mc, NodeInfo *nodes,

numa.c

+8 −5
Original line number Diff line number Diff line
@@ -338,15 +338,11 @@ void numa_default_auto_assign_ram(MachineClass *mc, NodeInfo *nodes, 
    nodes[i].node_mem = size - usedmem;

}



void parse_numa_opts(MachineState *ms)

void numa_complete_configuration(MachineState *ms)

{

    int i;

    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'

     * 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)

{

    int node_id = object_property_get_int(OBJECT(dev), "node-id", &error_abort);