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

numa: move numa global variable have_numa_distance into MachineState

Browse Source 
Move existing numa global have_numa_distance into NumaState.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>
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>
Message-Id: <20190809065731.9097-4-tao3.xu@intel.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Tao Xu 2019-08-09 14:57:23 +08:00 committed by Eduardo Habkost
parent aa57020774
commit 118154b767
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/arm/sbsa-ref.c
View File

@ -160,7 +160,7 @@ static void create_fdt(SBSAMachineState *sms)
qemu_fdt_setprop_cell(fdt, "/", "#address-cells", 0x2); qemu_fdt_setprop_cell(fdt, "/", "#address-cells", 0x2);
qemu_fdt_setprop_cell(fdt, "/", "#size-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); int size = nb_numa_nodes * nb_numa_nodes * 3 * sizeof(uint32_t);
uint32_t *matrix = g_malloc0(size); uint32_t *matrix = g_malloc0(size);
int idx, i, j; int idx, i, j;

2
hw/arm/virt-acpi-build.c
View File

@ -798,7 +798,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
if (ms->numa_state->num_nodes > 0) { if (ms->numa_state->num_nodes > 0) {
acpi_add_table(table_offsets, tables_blob); acpi_add_table(table_offsets, tables_blob);
build_srat(tables_blob, tables->linker, vms); 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); acpi_add_table(table_offsets, tables_blob);
build_slit(tables_blob, tables->linker, ms); build_slit(tables_blob, tables->linker, ms);
} }

2
hw/arm/virt.c
View File

@ -236,7 +236,7 @@ static void create_fdt(VirtMachineState *vms)
"clk24mhz"); "clk24mhz");
qemu_fdt_setprop_cell(fdt, "/apb-pclk", "phandle", vms->clock_phandle); 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); int size = nb_numa_nodes * nb_numa_nodes * 3 * sizeof(uint32_t);
uint32_t *matrix = g_malloc0(size); uint32_t *matrix = g_malloc0(size);
int idx, i, j; int idx, i, j;

5
hw/core/numa.c
View File

@ -55,7 +55,6 @@ static int have_mem;
static int max_numa_nodeid; /* Highest specified NUMA node ID, plus one. static int max_numa_nodeid; /* Highest specified NUMA node ID, plus one.
* For all nodes, nodeid < max_numa_nodeid * For all nodes, nodeid < max_numa_nodeid
*/ */
bool have_numa_distance;
NodeInfo numa_info[MAX_NODES]; 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; 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) 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 * asymmetric. In this case, the distances for both directions
* of all node pairs are required. * 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 enough NUMA distance information was provided. */
validate_numa_distance(ms); validate_numa_distance(ms);

2
hw/i386/acpi-build.c
View File

@ -2694,7 +2694,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
if (pcms->numa_nodes) { if (pcms->numa_nodes) {
acpi_add_table(table_offsets, tables_blob); acpi_add_table(table_offsets, tables_blob);
build_srat(tables_blob, tables->linker, machine); 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); acpi_add_table(table_offsets, tables_blob);
build_slit(tables_blob, tables->linker, machine); build_slit(tables_blob, tables->linker, machine);
} }

4
include/sysemu/numa.h
View File

@ -14,8 +14,6 @@ struct CPUArchId;
#define NUMA_DISTANCE_MAX 254 #define NUMA_DISTANCE_MAX 254
#define NUMA_DISTANCE_UNREACHABLE 255 #define NUMA_DISTANCE_UNREACHABLE 255
extern bool have_numa_distance;
struct NodeInfo { struct NodeInfo {
uint64_t node_mem; uint64_t node_mem;
struct HostMemoryBackend *node_memdev; struct HostMemoryBackend *node_memdev;
@ -34,6 +32,8 @@ struct NumaState {
/* Number of NUMA nodes */ /* Number of NUMA nodes */
int num_nodes; int num_nodes;
/* Allow setting NUMA distance for different NUMA nodes */
bool have_numa_distance;
}; };
typedef struct NumaState NumaState; typedef struct NumaState NumaState;