Commit 118154b7 authored by Tao Xu's avatar Tao Xu Committed by Eduardo Habkost
Browse files

numa: move numa global variable have_numa_distance into MachineState 



Move existing numa global have_numa_distance into NumaState.

Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarLiu Jingqi <jingqi.liu@intel.com>
Suggested-by: default avatarIgor Mammedov <imammedo@redhat.com>
Suggested-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarTao Xu <tao3.xu@intel.com>
Message-Id: <20190809065731.9097-4-tao3.xu@intel.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent aa570207

hw/arm/sbsa-ref.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static void create_fdt(SBSAMachineState *sms) 
    qemu_fdt_setprop_cell(fdt, "/", "#address-cells", 0x2);

    qemu_fdt_setprop_cell(fdt, "/", "#size-cells", 0x2);



    if (have_numa_distance) {

    if (ms->numa_state->have_numa_distance) {

        int size = nb_numa_nodes * nb_numa_nodes * 3 * sizeof(uint32_t);

        uint32_t *matrix = g_malloc0(size);

        int idx, i, j;

hw/arm/virt-acpi-build.c

+1 −1
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) 
    if (ms->numa_state->num_nodes > 0) {

        acpi_add_table(table_offsets, tables_blob);

        build_srat(tables_blob, tables->linker, vms);

        if (have_numa_distance) {

        if (ms->numa_state->have_numa_distance) {

            acpi_add_table(table_offsets, tables_blob);

            build_slit(tables_blob, tables->linker, ms);

        }

hw/arm/virt.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static void create_fdt(VirtMachineState *vms) 
                                "clk24mhz");

    qemu_fdt_setprop_cell(fdt, "/apb-pclk", "phandle", vms->clock_phandle);



    if (have_numa_distance) {

    if (nb_numa_nodes > 0 && ms->numa_state->have_numa_distance) {

        int size = nb_numa_nodes * nb_numa_nodes * 3 * sizeof(uint32_t);

        uint32_t *matrix = g_malloc0(size);

        int idx, i, j;

hw/core/numa.c

+2 −3
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ static int have_mem; 
static int max_numa_nodeid; /* Highest specified NUMA node ID, plus one.

                             * For all nodes, nodeid < max_numa_nodeid

                             */

bool have_numa_distance;

NodeInfo numa_info[MAX_NODES];
@@ -173,7 +172,7 @@ void parse_numa_distance(MachineState *ms, NumaDistOptions *dist, Error **errp) 
    }



    numa_info[src].distance[dst] = val;

    have_numa_distance = true;

    ms->numa_state->have_numa_distance = true;

}



void set_numa_options(MachineState *ms, NumaOptions *object, Error **errp)
@@ -446,7 +445,7 @@ void numa_complete_configuration(MachineState *ms) 
         * asymmetric. In this case, the distances for both directions

         * of all node pairs are required.

         */

        if (have_numa_distance) {

        if (ms->numa_state->have_numa_distance) {

            /* Validate enough NUMA distance information was provided. */

            validate_numa_distance(ms);

hw/i386/acpi-build.c

+1 −1
Original line number Diff line number Diff line
@@ -2694,7 +2694,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) 
    if (pcms->numa_nodes) {

        acpi_add_table(table_offsets, tables_blob);

        build_srat(tables_blob, tables->linker, machine);

        if (have_numa_distance) {

        if (machine->numa_state->have_numa_distance) {

            acpi_add_table(table_offsets, tables_blob);

            build_slit(tables_blob, tables->linker, machine);

        }