Re: [Qemu-devel] [PATCH] hw/arm/virt-acpi-build: Add a check for memory-less NUMA nodes

[Peter Maydell]

On 11 September 2018 at 12:26, Shannon Zhao <address@hidden> wrote:
> From: Shannon Zhao <address@hidden>
>
> 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 <address@hidden>
> ---
>  hw/arm/virt-acpi-build.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index ce31abd..5785fb6 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),
> --
> 2.9.3.windows.1



Applied to target-arm.next, thanks.

-- PMM