comments below, fix attached On 01/24/15 10:21, Shannon Zhao wrote: > XDST points to other tables except FACS & DSDT. > Implement a common header helper functions for generating ACPI tables. > > Signed-off-by: Shannon Zhao > --- > hw/arm/virt-acpi-build.c | 34 ++++++++++++++++++++++++++++++++++ > include/hw/acpi/acpi-defs.h | 9 +++++++++ > 2 files changed, 43 insertions(+), 0 deletions(-) > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index 9c3971a..446947a 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -61,6 +61,22 @@ > #define ACPI_BUILD_RSDP_FILE "etc/acpi/rsdp" > #define ACPI_BUILD_TPMLOG_FILE "etc/tpm/log" > > +static void > +build_header(GArray *linker, GArray *table_data, > + AcpiTableHeader *h, const char *sig, int len, uint8_t rev) > +{ > + memcpy(&h->signature, sig, sizeof(h->signature)); > + h->length = cpu_to_le32(len); > + h->revision = rev; > + memcpy(h->oem_id, ACPI_VIRT_QEMU_STR_6, sizeof(h->oem_id)); > + memcpy(h->oem_table_id, ACPI_VIRT_MACH_STR_8, sizeof(h->oem_table_id)); > + h->oem_revision = cpu_to_le32(1); > + h->checksum = 0; > + /* Checksum to be filled in by Guest linker */ > + bios_linker_loader_add_checksum(linker, ACPI_BUILD_TABLE_FILE, > + table_data->data, h, len, &h->checksum); > +} > + > static inline void *acpi_data_push(GArray *table_data, uint64_t size) > { > unsigned off = table_data->len; > @@ -115,6 +131,24 @@ build_rsdp(GArray *rsdp_table, GArray *linker, uint64_t xsdt) > static void > build_xsdt(GArray *table_data, GArray *linker, GArray *table_offsets) > { > + AcpiXsdtDescriptor *xsdt; > + size_t xsdt_len; > + int i; > + > + xsdt_len = sizeof(*xsdt) + sizeof(uint64_t) * table_offsets->len; > + xsdt = acpi_data_push(table_data, xsdt_len); > + memcpy(xsdt->table_offset_entry, table_offsets->data, > + sizeof(uint64_t) * table_offsets->len); This is a bug, but it's not introduced here. The bug is introduced in: [RFC PATCH 02/11] hw/arm/virt-acpi-build: Basic framework for building ACPI tables I'm attaching the fix. Please do not squash the fix into this patch; you have to split it up. The code fixes go into 02/11, and the typo fix goes: > + for (i = 0; i < table_offsets->len; ++i) { > + /* rsdt->table_offset_entry to be filled by Guest linker */ here. Thanks, Laszlo