mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

acpi: build_mcfg: use acpi_table_begin()/acpi_table_end() instead of build_header()

Browse Source 
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>
Message-Id: <20210924122802.1455362-9-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Igor Mammedov 2021-09-24 08:27:35 -04:00 committed by Michael S. Tsirkin
parent 13229858cf
commit 578bc7a064
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/acpi/pci.c
View File

@ -28,19 +28,20 @@
#include "hw/acpi/pci.h" #include "hw/acpi/pci.h"
#include "hw/pci/pcie_host.h" #include "hw/pci/pcie_host.h"
void build_mcfg(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info, /*
const char *oem_id, const char *oem_table_id)
{
int mcfg_start = table_data->len;
/*
* PCI Firmware Specification, Revision 3.0 * PCI Firmware Specification, Revision 3.0
* 4.1.2 MCFG Table Description. * 4.1.2 MCFG Table Description.
*/ */
acpi_data_push(table_data, sizeof(AcpiTableHeader)); void build_mcfg(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info,
const char *oem_id, const char *oem_table_id)
{
AcpiTable table = { .sig = "MCFG", .rev = 1,
.oem_id = oem_id, .oem_table_id = oem_table_id };
acpi_table_begin(&table, table_data);
/* Reserved */ /* Reserved */
build_append_int_noprefix(table_data, 0, 8); build_append_int_noprefix(table_data, 0, 8);
/* /*
* Memory Mapped Enhanced Configuration Space Base Address Allocation * Memory Mapped Enhanced Configuration Space Base Address Allocation
* Structure * Structure
@ -56,6 +57,5 @@ void build_mcfg(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info,
/* Reserved */ /* Reserved */
build_append_int_noprefix(table_data, 0, 4); build_append_int_noprefix(table_data, 0, 4);
build_header(linker, table_data, (void *)(table_data->data + mcfg_start), acpi_table_end(linker, &table);
"MCFG", table_data->len - mcfg_start, 1, oem_id, oem_table_id);
} }