[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 12/35] acpi: vmgenid_build_acpi: use acpi_table_begin()/acpi_t
From: |
Igor Mammedov |
Subject: |
[PATCH v4 12/35] acpi: vmgenid_build_acpi: use acpi_table_begin()/acpi_table_end() instead of build_header() |
Date: |
Fri, 24 Sep 2021 08:27:39 -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.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
---
v4:
* drop not related "vgia_offset = table_data->len" newline change
(Reviewed-by: Eric Auger <eric.auger@redhat.com>)
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
---
hw/acpi/vmgenid.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c
index 4f41a13ea0..0c9f158ac9 100644
--- a/hw/acpi/vmgenid.c
+++ b/hw/acpi/vmgenid.c
@@ -29,6 +29,8 @@ void vmgenid_build_acpi(VmGenIdState *vms, GArray
*table_data, GArray *guid,
Aml *ssdt, *dev, *scope, *method, *addr, *if_ctx;
uint32_t vgia_offset;
QemuUUID guid_le;
+ AcpiTable table = { .sig = "SSDT", .rev = 1,
+ .oem_id = oem_id, .oem_table_id = "VMGENID" };
/* Fill in the GUID values. These need to be converted to little-endian
* first, since that's what the guest expects
@@ -42,12 +44,10 @@ void vmgenid_build_acpi(VmGenIdState *vms, GArray
*table_data, GArray *guid,
g_array_insert_vals(guid, VMGENID_GUID_OFFSET, guid_le.data,
ARRAY_SIZE(guid_le.data));
- /* Put this in a separate SSDT table */
+ /* Put VMGNEID into a separate SSDT table */
+ acpi_table_begin(&table, table_data);
ssdt = init_aml_allocator();
- /* Reserve space for header */
- acpi_data_push(ssdt->buf, sizeof(AcpiTableHeader));
-
/* Storage for the GUID address */
vgia_offset = table_data->len +
build_append_named_dword(ssdt->buf, "VGIA");
@@ -116,9 +116,8 @@ void vmgenid_build_acpi(VmGenIdState *vms, GArray
*table_data, GArray *guid,
ACPI_BUILD_TABLE_FILE, vgia_offset, sizeof(uint32_t),
VMGENID_GUID_FW_CFG_FILE, 0);
- build_header(linker, table_data,
- (void *)(table_data->data + table_data->len - ssdt->buf->len),
- "SSDT", ssdt->buf->len, 1, oem_id, "VMGENID");
+ /* must be called after above command to ensure correct table checksum */
+ acpi_table_end(linker, &table);
free_aml_allocator();
}
--
2.27.0
- [PATCH v4 02/35] acpi: build_rsdt: use acpi_table_begin()/acpi_table_end() instead of build_header(), (continued)
- [PATCH v4 02/35] acpi: build_rsdt: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 03/35] acpi: build_xsdt: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 04/35] acpi: build_slit: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 06/35] acpi: build_tpm2: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 05/35] acpi: build_fadt: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 07/35] acpi: acpi_build_hest: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 08/35] acpi: build_mcfg: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 09/35] acpi: build_hmat: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 10/35] acpi: nvdimm_build_nfit: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 11/35] acpi: nvdimm_build_ssdt: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 12/35] acpi: vmgenid_build_acpi: use acpi_table_begin()/acpi_table_end() instead of build_header(),
Igor Mammedov <=
- [PATCH v4 13/35] acpi: x86: build_dsdt: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 14/35] acpi: build_hpet: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 15/35] acpi: build_tpm_tcpa: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 16/35] acpi: arm/x86: build_srat: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 17/35] acpi: use build_append_int_noprefix() API to compose SRAT table, Igor Mammedov, 2021/09/24
- [PATCH v4 18/35] acpi: build_dmar_q35: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 19/35] acpi: build_waet: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 20/35] acpi: build_amd_iommu: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 21/35] acpi: madt: arm/x86: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24