[Qemu-devel] [PATCH 2/2] acpi: cleanups tcpa table generation

[Michael S. Tsirkin]

Improve readability, no functional changes.

Signed-off-by: Michael S. Tsirkin <address@hidden>
---
 hw/i386/acpi-build.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 66cde2b..6ae3a9e 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1209,17 +1209,13 @@ build_hpet(GArray *table_data, GArray *linker)
 static void
 build_tpm_tcpa(GArray *table_data, GArray *linker)
 {
-    Acpi20Tcpa *tcpa;
-    uint32_t log_area_minimum_length = TPM_LOG_AREA_MINIMUM_SIZE;
-    uint64_t log_area_start_address;
-    size_t len = log_area_minimum_length + sizeof(*tcpa);
+    Acpi20Tcpa *tcpa = acpi_data_push(table_data, sizeof *tcpa);
+    uint64_t log_area_start_address = acpi_data_len(table_data);
 
-    log_area_start_address = table_data->len + sizeof(*tcpa);
-
-    tcpa = acpi_data_push(table_data, len);
+    acpi_data_push(table_data, TPM_LOG_AREA_MINIMUM_SIZE);
 
     tcpa->platform_class = cpu_to_le16(TPM_TCPA_ACPI_CLASS_CLIENT);
-    tcpa->log_area_minimum_length = cpu_to_le32(log_area_minimum_length);
+    tcpa->log_area_minimum_length = cpu_to_le32(TPM_LOG_AREA_MINIMUM_SIZE);
     tcpa->log_area_start_address = cpu_to_le64(log_area_start_address);
 
     /* LASA address to be filled by Guest linker */
-- 
MST