Make the BIOS linker optional in acpi_table_end() and calculate the ACPI
table checksum directly if no linker is provided.
This makes it possible to call for example
acpi_build_madt() from outside the ACPI table builder context.
Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
hw/acpi/aml-build.c | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index dad4cfcc7d..6a3650076f 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -1730,6 +1730,25 @@ void acpi_table_begin(AcpiTable *desc, GArray *array)
build_append_int_noprefix(array, 1, 4); /* Creator Revision */
}
+static uint8_t calculate_acpi_checksum(const gchar *data, size_t len)
+{
+ size_t i;
+ uint8_t sum = 0;
+
+ for (i = 0; i < len; ++i) {
+ sum += (uint8_t)data[i];
+ }
+
+ return sum;
+}
+
+static void update_acpi_checksum(gchar *data, size_t start_offset,
+ size_t table_len, size_t checksum_offset)
+{
+ uint8_t sum = calculate_acpi_checksum(&data[start_offset], table_len);
+ data[checksum_offset] = 0xff - sum + 1;
+}
+
void acpi_table_end(BIOSLinker *linker, AcpiTable *desc)
{
/*
@@ -1748,8 +1767,14 @@ void acpi_table_end(BIOSLinker *linker, AcpiTable *desc)
*/
memcpy(len_ptr, &table_len_le, sizeof table_len_le);
- bios_linker_loader_add_checksum(linker, ACPI_BUILD_TABLE_FILE,
- desc->table_offset, table_len, desc->table_offset + checksum_offset);
+ if (linker != NULL) {
+ bios_linker_loader_add_checksum(linker, ACPI_BUILD_TABLE_FILE,
+ desc->table_offset, table_len,
+ desc->table_offset + checksum_offset);
+ } else {
+ update_acpi_checksum(desc->array->data, desc->table_offset,
+ table_len, desc->table_offset + checksum_offset);
+ }
}
void *acpi_data_push(GArray *table_data, unsigned size)
--
2.52.0