| Message ID | 20210907144814.741785-5-imammedo@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | acpi: refactor error prone build_header() and packed structures usage in ACPI tables | expand |
On 9/7/21 4:47 PM, Igor Mammedov wrote: > 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> Eric > --- > v3: > * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/ > --- > hw/acpi/aml-build.c | 13 +++++-------- > 1 file changed, 5 insertions(+), 8 deletions(-) > > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c > index daefc132f3..e54face23d 100644 > --- a/hw/acpi/aml-build.c > +++ b/hw/acpi/aml-build.c > @@ -1954,11 +1954,12 @@ void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, > void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms, > const char *oem_id, const char *oem_table_id) > { > - int slit_start, i, j; > - slit_start = table_data->len; > + int i, j; > int nb_numa_nodes = ms->numa_state->num_nodes; > + AcpiTable table = { .sig = "SLIT", .rev = 1, > + .oem_id = oem_id, .oem_table_id = oem_table_id }; > > - acpi_data_push(table_data, sizeof(AcpiTableHeader)); > + acpi_table_begin(&table, table_data); > > build_append_int_noprefix(table_data, nb_numa_nodes, 8); > for (i = 0; i < nb_numa_nodes; i++) { > @@ -1969,11 +1970,7 @@ void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms, > 1); > } > } > - > - build_header(linker, table_data, > - (void *)(table_data->data + slit_start), > - "SLIT", > - table_data->len - slit_start, 1, oem_id, oem_table_id); > + acpi_table_end(linker, &table); > } > > /* build rev1/rev3/rev5.1 FADT */ >
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index daefc132f3..e54face23d 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1954,11 +1954,12 @@ void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms, const char *oem_id, const char *oem_table_id) { - int slit_start, i, j; - slit_start = table_data->len; + int i, j; int nb_numa_nodes = ms->numa_state->num_nodes; + AcpiTable table = { .sig = "SLIT", .rev = 1, + .oem_id = oem_id, .oem_table_id = oem_table_id }; - acpi_data_push(table_data, sizeof(AcpiTableHeader)); + acpi_table_begin(&table, table_data); build_append_int_noprefix(table_data, nb_numa_nodes, 8); for (i = 0; i < nb_numa_nodes; i++) { @@ -1969,11 +1970,7 @@ void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms, 1); } } - - build_header(linker, table_data, - (void *)(table_data->data + slit_start), - "SLIT", - table_data->len - slit_start, 1, oem_id, oem_table_id); + acpi_table_end(linker, &table); } /* build rev1/rev3/rev5.1 FADT */
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> --- v3: * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/ --- hw/acpi/aml-build.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)