| Message ID | 20190508061726.27631-3-tao3.xu@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | Build ACPI Heterogeneous Memory Attribute Table (HMAT) | expand |
On Wed, 8 May 2019 14:17:17 +0800 Tao Xu <tao3.xu@intel.com> wrote: > The aim of this patch is to move existing numa global have_numa_distance > into NumaState. s/The aim of this patch is to// > Reviewed-by: Liu Jingqi <jingqi.liu@intel.com> > Suggested-by: Igor Mammedov <imammedo@redhat.com> > Suggested-by: Eduardo Habkost <ehabkost@redhat.com> > Signed-off-by: Tao Xu <tao3.xu@intel.com> > --- Reviewed-by: Igor Mammedov <imammedo@redhat.com> > Changes in v4 -> v3: > - send the patch together with HMAT patches > --- > hw/arm/virt-acpi-build.c | 2 +- > hw/arm/virt.c | 2 +- > hw/i386/acpi-build.c | 2 +- > include/hw/boards.h | 2 ++ > include/sysemu/numa.h | 2 -- > numa.c | 5 ++--- > 6 files changed, 7 insertions(+), 8 deletions(-) > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index 6805b4de51..65f070843c 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -815,7 +815,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) > if (nb_numa_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); > } > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 70954b658d..f0818ef597 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -228,7 +228,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; > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 7d9bc88ac9..43a807c483 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -2685,7 +2685,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); > } > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 5f102e3075..c3c678b7ff 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -237,6 +237,8 @@ typedef struct NumaState { > /* Number of NUMA nodes */ > int num_nodes; > > + /* Allow setting NUMA distance for different NUMA nodes */ > + bool have_numa_distance; > } NumaState; > > /** > diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h > index a55e2be563..1a29408db9 100644 > --- a/include/sysemu/numa.h > +++ b/include/sysemu/numa.h > @@ -6,8 +6,6 @@ > #include "sysemu/hostmem.h" > #include "hw/boards.h" > > -extern bool have_numa_distance; > - > struct NodeInfo { > uint64_t node_mem; > struct HostMemoryBackend *node_memdev; > diff --git a/numa.c b/numa.c > index 343fcaf13f..d4f5ff5193 100644 > --- a/numa.c > +++ b/numa.c > @@ -52,7 +52,6 @@ static int have_memdevs = -1; > 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]; > > > @@ -171,7 +170,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; > } > > static > @@ -442,7 +441,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); >
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 6805b4de51..65f070843c 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -815,7 +815,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) if (nb_numa_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); } diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 70954b658d..f0818ef597 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -228,7 +228,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; diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 7d9bc88ac9..43a807c483 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2685,7 +2685,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); } diff --git a/include/hw/boards.h b/include/hw/boards.h index 5f102e3075..c3c678b7ff 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -237,6 +237,8 @@ typedef struct NumaState { /* Number of NUMA nodes */ int num_nodes; + /* Allow setting NUMA distance for different NUMA nodes */ + bool have_numa_distance; } NumaState; /** diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index a55e2be563..1a29408db9 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -6,8 +6,6 @@ #include "sysemu/hostmem.h" #include "hw/boards.h" -extern bool have_numa_distance; - struct NodeInfo { uint64_t node_mem; struct HostMemoryBackend *node_memdev; diff --git a/numa.c b/numa.c index 343fcaf13f..d4f5ff5193 100644 --- a/numa.c +++ b/numa.c @@ -52,7 +52,6 @@ static int have_memdevs = -1; 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]; @@ -171,7 +170,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; } static @@ -442,7 +441,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);