diff options
| author | Tao Xu <tao3.xu@intel.com> | 2019-08-09 14:57:22 +0800 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2019-09-03 11:26:55 -0300 |
| commit | aa57020774b690a22be72453b8e91c9b5a68c516 (patch) | |
| tree | 144a939fcca5737815d9134a45c44993ae36acce /hw/arm/boot.c | |
| parent | 2744ece8095b8cdb0d667654debc1d80dd57bbd3 (diff) | |
| download | qemu-aa57020774b690a22be72453b8e91c9b5a68c516.zip qemu-aa57020774b690a22be72453b8e91c9b5a68c516.tar.gz qemu-aa57020774b690a22be72453b8e91c9b5a68c516.tar.bz2 | |
numa: move numa global variable nb_numa_nodes into MachineState
Add struct NumaState in MachineState and move existing numa global
nb_numa_nodes(renamed as "num_nodes") into NumaState. And add variable
numa_support into MachineClass to decide which submachines support NUMA.
Reviewed-by: Igor Mammedov <imammedo@redhat.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-3-tao3.xu@intel.com>
[ehabkost: include hw/boards.h again to fix build failures]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/arm/boot.c')
| -rw-r--r-- | hw/arm/boot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/arm/boot.c b/hw/arm/boot.c index b46eaef..d3e8862 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -598,9 +598,9 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo, } g_strfreev(node_path); - if (nb_numa_nodes > 0) { + if (ms->numa_state != NULL && ms->numa_state->num_nodes > 0) { mem_base = binfo->loader_start; - for (i = 0; i < nb_numa_nodes; i++) { + for (i = 0; i < ms->numa_state->num_nodes; i++) { mem_len = numa_info[i].node_mem; rc = fdt_add_memory_node(fdt, acells, mem_base, scells, mem_len, i); |