[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 21/53] acpi: build_xsdt: use acpi_init_table()/acpi_table_compose
From: |
Igor Mammedov |
Subject: |
[PATCH 21/53] acpi: build_xsdt: use acpi_init_table()/acpi_table_composed() instead of build_header() |
Date: |
Fri, 25 Jun 2021 05:17:46 -0400 |
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>
---
include/hw/acpi/acpi-defs.h | 10 ----------
hw/acpi/aml-build.c | 27 ++++++++++++---------------
2 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index ccfa3382aa..f6d2ca172b 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -149,16 +149,6 @@ struct AcpiSerialPortConsoleRedirection {
typedef struct 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)
*/
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index f7241ea5ec..e4089edc6c 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -1907,27 +1907,24 @@ build_xsdt(GArray *table_data, BIOSLinker *linker,
GArray *table_offsets,
const char *oem_id, const char *oem_table_id)
{
int i;
- unsigned xsdt_entries_offset;
- AcpiXsdtDescriptorRev2 *xsdt;
- int xsdt_start = table_data->len;
- const unsigned table_data_len = (sizeof(uint64_t) * table_offsets->len);
- 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;
+ AcpiTable table = { .sig = "XSDT", .rev = 1,
+ .oem_id = oem_id, .oem_table_id = oem_table_id };
+
+ acpi_init_table(&table, table_data);
+
for (i = 0; i < table_offsets->len; ++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,
- 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);
}
- build_header(linker, table_data,
- (void *)(table_data->data + xsdt_start),
- "XSDT", xsdt_len, 1, oem_id, oem_table_id);
+ acpi_table_composed(linker, &table);
}
void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base,
--
2.27.0
- [PATCH 12/53] tests: acpi: arm/virt: drop redudant test_acpi_one() in test_acpi_virt_tcg(), (continued)
- [PATCH 12/53] tests: acpi: arm/virt: drop redudant test_acpi_one() in test_acpi_virt_tcg(), Igor Mammedov, 2021/06/25
- [PATCH 13/53] tests: acpi: whitelist expected tables for acpi/virt/iort testcase, Igor Mammedov, 2021/06/25
- [PATCH 14/53] tests: acpi: arm/virt: use kvm to test IORT table, Igor Mammedov, 2021/06/25
- [PATCH 12/53] tests: acpi: arm/virt: drop redundant test_acpi_one() in test_acpi_virt_tcg(), Igor Mammedov, 2021/06/25
- [PATCH 18/53] tests: bios-tables-test: use qtest_has_accel() API to register TCG only tests, Igor Mammedov, 2021/06/25
- [PATCH 17/53] tests: migration-test: use qtest_has_accel() API, Igor Mammedov, 2021/06/25
- [PATCH 19/53] acpi: add helper routines to initialize ACPI tables, Igor Mammedov, 2021/06/25
- [PATCH 20/53] acpi: build_rsdt: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 22/53] acpi: build_slit: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 23/53] acpi: build_fadt: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 21/53] acpi: build_xsdt: use acpi_init_table()/acpi_table_composed() instead of build_header(),
Igor Mammedov <=
- [PATCH 26/53] acpi: build_mcfg: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 25/53] acpi: acpi_build_hest: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 24/53] acpi: build_tpm2: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 28/53] acpi: nvdimm_build_nfit: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 29/53] acpi: nvdimm_build_ssdt: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 31/53] acpi: x86: build_dsdt: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 30/53] acpi: vmgenid_build_acpi: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 27/53] acpi: build_hmat: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 32/53] acpi: build_hpet: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25