mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

acpi: build_xsdt: use acpi_table_begin()/acpi_table_end() instead of build_header()

Browse Source 
it replaces error-prone pointer arithmetic for build_header() API,
with 2 calls to start and finish table creation,
which hides offsets magic from API user.

While at it switch to build_append_int_noprefix() to build
entries to other tables (which also removes some manual offset
calculations).

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Message-Id: <20210924122802.1455362-4-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Igor Mammedov 2021-09-24 08:27:30 -04:00 committed by Michael S. Tsirkin
parent ea298e83a7
commit f497b7cae1
2 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/acpi/aml-build.c
View File

@ -1912,33 +1912,32 @@ build_rsdt(GArray *table_data, BIOSLinker *linker, GArray *table_offsets,
acpi_table_end(linker, &table); acpi_table_end(linker, &table);
} }
/* Build xsdt table */ /*
* ACPI 2.0 eXtended System Description Table (XSDT)
*/
void void
build_xsdt(GArray *table_data, BIOSLinker *linker, GArray *table_offsets, build_xsdt(GArray *table_data, BIOSLinker *linker, GArray *table_offsets,
const char *oem_id, const char *oem_table_id) const char *oem_id, const char *oem_table_id)
{ {
int i; int i;
unsigned xsdt_entries_offset; AcpiTable table = { .sig = "XSDT", .rev = 1,
AcpiXsdtDescriptorRev2 *xsdt; .oem_id = oem_id, .oem_table_id = oem_table_id };
int xsdt_start = table_data->len;
const unsigned table_data_len = (sizeof(uint64_t) * table_offsets->len); acpi_table_begin(&table, table_data);
const unsigned xsdt_entry_size = sizeof(xsdt->table_offset_entry[0]);
const size_t xsdt_len = sizeof(*xsdt) + table_data_len;
xsdt = acpi_data_push(table_data, xsdt_len);
xsdt_entries_offset = (char *)xsdt->table_offset_entry - table_data->data;
for (i = 0; i < table_offsets->len; ++i) { for (i = 0; i < table_offsets->len; ++i) {
uint64_t ref_tbl_offset = g_array_index(table_offsets, uint32_t, i); uint64_t ref_tbl_offset = g_array_index(table_offsets, uint32_t, i);
uint64_t xsdt_entry_offset = xsdt_entries_offset + xsdt_entry_size * i; uint64_t xsdt_entry_offset = table.array->len;
/* xsdt->table_offset_entry to be filled by Guest linker */ /* reserve space for entry */
build_append_int_noprefix(table.array, 0, 8);
/* mark position of RSDT entry to be filled by Guest linker */
bios_linker_loader_add_pointer(linker, bios_linker_loader_add_pointer(linker,
ACPI_BUILD_TABLE_FILE, xsdt_entry_offset, xsdt_entry_size, ACPI_BUILD_TABLE_FILE, xsdt_entry_offset, 8,
ACPI_BUILD_TABLE_FILE, ref_tbl_offset); ACPI_BUILD_TABLE_FILE, ref_tbl_offset);
} }
build_header(linker, table_data, acpi_table_end(linker, &table);
(void *)(table_data->data + xsdt_start),
"XSDT", xsdt_len, 1, oem_id, oem_table_id);
} }
void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base,

10
include/hw/acpi/acpi-defs.h
View File

@ -149,16 +149,6 @@ struct AcpiSerialPortConsoleRedirection {
typedef struct AcpiSerialPortConsoleRedirection typedef struct AcpiSerialPortConsoleRedirection
AcpiSerialPortConsoleRedirection; AcpiSerialPortConsoleRedirection;
/*
* ACPI 2.0 eXtended System Description Table (XSDT)
*/
struct AcpiXsdtDescriptorRev2 {
ACPI_TABLE_HEADER_DEF /* ACPI common table header */
uint64_t table_offset_entry[]; /* Array of pointers to other */
/* ACPI tables */
} QEMU_PACKED;
typedef struct AcpiXsdtDescriptorRev2 AcpiXsdtDescriptorRev2;
/* /*
* ACPI 1.0 Firmware ACPI Control Structure (FACS) * ACPI 1.0 Firmware ACPI Control Structure (FACS)
*/ */