| Message ID | 1461571547-13132-4-git-send-email-zhaoshenglong@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
On Mon, Apr 25, 2016 at 04:05:45PM +0800, Shannon Zhao wrote: > From: Shannon Zhao <shannon.zhao@linaro.org> > > ACPI spec says that Proximity Domain is an "Integer that represents > the proximity domain to which the processor belongs". So define it as a > uint32_t. > > Cc: Michael S. Tsirkin <mst@redhat.com> > Cc: Igor Mammedov <imammedo@redhat.com> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> > --- > hw/i386/acpi-build.c | 3 +-- > include/hw/acpi/acpi-defs.h | 2 +- > 2 files changed, 2 insertions(+), 3 deletions(-) Reviewed-by: Andrew Jones <drjones@redhat.com> > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 9ae4c0d..3c031aa 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -2440,8 +2440,7 @@ acpi_build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, > { > numamem->type = ACPI_SRAT_MEMORY; > numamem->length = sizeof(*numamem); > - memset(numamem->proximity, 0, 4); > - numamem->proximity[0] = node; > + numamem->proximity = cpu_to_le32(node); > numamem->flags = cpu_to_le32(flags); > numamem->base_addr = cpu_to_le64(base); > numamem->range_length = cpu_to_le64(len); > diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h > index bcf5c3f..850a962 100644 > --- a/include/hw/acpi/acpi-defs.h > +++ b/include/hw/acpi/acpi-defs.h > @@ -475,7 +475,7 @@ typedef struct AcpiSratProcessorAffinity AcpiSratProcessorAffinity; > struct AcpiSratMemoryAffinity > { > ACPI_SUB_HEADER_DEF > - uint8_t proximity[4]; > + uint32_t proximity; > uint16_t reserved1; > uint64_t base_addr; > uint64_t range_length; > -- > 2.0.4 > > >
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 9ae4c0d..3c031aa 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2440,8 +2440,7 @@ acpi_build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, { numamem->type = ACPI_SRAT_MEMORY; numamem->length = sizeof(*numamem); - memset(numamem->proximity, 0, 4); - numamem->proximity[0] = node; + numamem->proximity = cpu_to_le32(node); numamem->flags = cpu_to_le32(flags); numamem->base_addr = cpu_to_le64(base); numamem->range_length = cpu_to_le64(len); diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h index bcf5c3f..850a962 100644 --- a/include/hw/acpi/acpi-defs.h +++ b/include/hw/acpi/acpi-defs.h @@ -475,7 +475,7 @@ typedef struct AcpiSratProcessorAffinity AcpiSratProcessorAffinity; struct AcpiSratMemoryAffinity { ACPI_SUB_HEADER_DEF - uint8_t proximity[4]; + uint32_t proximity; uint16_t reserved1; uint64_t base_addr; uint64_t range_length;