@@ -276,6 +276,12 @@ Aml *aml_varpackage(uint32_t num_elements);
Aml *aml_touuid(const char *uuid);
Aml *aml_unicode(const char *str);
+struct BlobOffset {
+ const char *blob_name; /* no ownership; set from ACPI_BUILD_*_FILE */
+ uint32_t offset; /* offset into blob named @blob_name */
+};
+typedef struct BlobOffset BlobOffset;
+
void
build_header(GArray *linker, GArray *table_data,
AcpiTableHeader *h, const char *sig, int len, uint8_t rev);
@@ -1171,8 +1171,11 @@ unsigned acpi_data_len(GArray *table)
void acpi_add_table(GArray *table_offsets, GArray *table_data)
{
- uint32_t offset = cpu_to_le32(table_data->len);
- g_array_append_val(table_offsets, offset);
+ BlobOffset blob_offset = {
+ .blob_name = ACPI_BUILD_TABLE_FILE,
+ .offset = cpu_to_le32(table_data->len)
+ };
+ g_array_append_val(table_offsets, blob_offset);
}
void acpi_build_tables_init(AcpiBuildTables *tables)
@@ -1199,16 +1202,17 @@ build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets)
AcpiRsdtDescriptorRev1 *rsdt;
size_t rsdt_len;
int i;
- const int table_data_len = (sizeof(uint32_t) * table_offsets->len);
- rsdt_len = sizeof(*rsdt) + table_data_len;
+ rsdt_len = sizeof(*rsdt) + sizeof(uint32_t) * table_offsets->len;
rsdt = acpi_data_push(table_data, rsdt_len);
- memcpy(rsdt->table_offset_entry, table_offsets->data, table_data_len);
for (i = 0; i < table_offsets->len; ++i) {
+ BlobOffset *blob_offset = (BlobOffset *)table_offsets->data + i;
+
+ rsdt->table_offset_entry[i] = blob_offset->offset;
/* rsdt->table_offset_entry to be filled by Guest linker */
bios_linker_loader_add_pointer(linker,
ACPI_BUILD_TABLE_FILE,
- ACPI_BUILD_TABLE_FILE,
+ blob_offset->blob_name,
table_data, &rsdt->table_offset_entry[i],
sizeof(uint32_t));
}
@@ -557,7 +557,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables)
virt_acpi_get_cpu_info(&cpuinfo);
table_offsets = g_array_new(false, true /* clear */,
- sizeof(uint32_t));
+ sizeof(BlobOffset));
bios_linker_loader_alloc(tables->linker, ACPI_BUILD_TABLE_FILE,
64, false /* high memory */);
@@ -1679,7 +1679,7 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables)
acpi_get_pci_info(&pci);
table_offsets = g_array_new(false, true /* clear */,
- sizeof(uint32_t));
+ sizeof(BlobOffset));
ACPI_BUILD_DPRINTF("init ACPI tables\n");
bios_linker_loader_alloc(tables->linker, ACPI_BUILD_TABLE_FILE,
The build_rsdt() function can relocate RSDT entries only to ACPI tables that exist inside the same ACPI_BUILD_TABLE_FILE blob. In order to relax this limitation, change the element type of the "table_offsets" array from plain offset (always into ACPI_BUILD_TABLE_FILE) to a (pointed-to-blob, offset) pair. For compatibility with the current callers of acpi_add_table() and build_rsdt(), acpi_add_table() will hard-code ACPI_BUILD_TABLE_FILE as pointed-to-blob. However, the pointed-to-blob can now be determined when adding an ACPI table, case by case, not when building the RSDT. Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Gal Hammer <ghammer@redhat.com> Cc: Igor Mammedov <imammedo@redhat.com> Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Shannon Zhao <shannon.zhao@linaro.org> Signed-off-by: Laszlo Ersek <lersek@redhat.com> --- include/hw/acpi/aml-build.h | 6 ++++++ hw/acpi/aml-build.c | 16 ++++++++++------ hw/arm/virt-acpi-build.c | 2 +- hw/i386/acpi-build.c | 2 +- 4 files changed, 18 insertions(+), 8 deletions(-)