diff options
| author | Shannon Zhao | 2018-09-25 15:02:30 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-09-25 15:14:07 +0200 |
| commit | 66c353cea6c06c64fc68d1f663fdfdca55d4e421 (patch) | |
| tree | 1a04020ae3cc0da2abbf6d690c2055d19047b71c /hw | |
| parent | hw/arm/exynos4210: fix Exynos4210 UART support (diff) | |
| download | qemu-66c353cea6c06c64fc68d1f663fdfdca55d4e421.tar.gz qemu-66c353cea6c06c64fc68d1f663fdfdca55d4e421.tar.xz qemu-66c353cea6c06c64fc68d1f663fdfdca55d4e421.zip | |
hw/arm/virt-acpi-build: Add a check for memory-less NUMA nodes
Like commit 16b4226(hw/acpi-build: Add a check for memory-less NUMA node
), it also needs to check memory length for NUMA nodes on ARM.
Signed-off-by: Shannon Zhao <shannon.zhaosl@gmail.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Message-id: 20180911112643.19296-1-shenglong.zsl@alibaba-inc.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/arm/virt-acpi-build.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index ce31abd62c..5785fb697c 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -562,10 +562,12 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) mem_base = vms->memmap[VIRT_MEM].base; for (i = 0; i < nb_numa_nodes; ++i) { - numamem = acpi_data_push(table_data, sizeof(*numamem)); - build_srat_memory(numamem, mem_base, numa_info[i].node_mem, i, - MEM_AFFINITY_ENABLED); - mem_base += numa_info[i].node_mem; + if (numa_info[i].node_mem > 0) { + numamem = acpi_data_push(table_data, sizeof(*numamem)); + build_srat_memory(numamem, mem_base, numa_info[i].node_mem, i, + MEM_AFFINITY_ENABLED); + mem_base += numa_info[i].node_mem; + } } build_header(linker, table_data, (void *)(table_data->data + srat_start), |