Rework ACPI OEM fields handling to simplify code (was: acpi: Remove duplicated code handling OEM ID and OEM table ID fields)
v4 cover Rework ACPI OEM fields handling to simplify code (was: acpi: Remove duplicated code handling OEM ID and OEM table ID fields)
This patch consolidates ACPI OEM fields handling
by:
- Moving common code in PC and MICROVM to X86.
- Changes unnecessary dynamic memory allocation to static allocation
- Uses dedicated structure to keep values of fields instead of two separate strings
- Adds helper functions to initialize the structure
v2:
- Move the setters/getters of OEM fields to X86MachineState to remove duplication
- Change commit message to make it clear the second commit is a re-factor
v3:
- Rebase "acpi: Consolidate the handling of OEM ID and OEM Table ID fields to latest" to latest HEAD
- Dropped "acpi: Move setters/getters of oem fields to X86MachineState" since it was accepted already
v4:
- Drop helper macros and use static inline functions instead
- Removed variables starting with __
- Used consistent naming for helper functions that start with ACPI_BUILD_OEM_*
- Didn't drop the defines ACPI_BUILD_APPNAME6 and ACPI_BUILD_APPNAME8 since ACPI_BUILD_APPNAME8 is still used in build_header() in aml-build.c and it feels better to keep them defined together. But if others prefer to drop the ACPI_BUILD_APPNAME6 define, will resend the patch.
Marian Postevca (1):
acpi: Consolidate the handling of OEM ID and OEM Table ID fields
hw/acpi/hmat.h | 2 +- hw/i386/acpi-common.h | 2 +- include/hw/acpi/acpi-build-oem.h | 61 +++++++++++++++++++++++++ include/hw/acpi/aml-build.h | 15 +++--- include/hw/acpi/ghes.h | 2 +- include/hw/acpi/pci.h | 2 +- include/hw/acpi/vmgenid.h | 2 +- include/hw/arm/virt.h | 4 +- include/hw/i386/x86.h | 4 +- include/hw/mem/nvdimm.h | 4 +- hw/acpi/aml-build.c | 27 ++++++----- hw/acpi/ghes.c | 5 +- hw/acpi/hmat.c | 4 +- hw/acpi/nvdimm.c | 22 +++++---- hw/acpi/pci.c | 4 +- hw/acpi/vmgenid.c | 6 ++- hw/arm/virt-acpi-build.c | 40 ++++++---------- hw/arm/virt.c | 16 +++---- hw/i386/acpi-build.c | 78 +++++++++++++++----------------- hw/i386/acpi-common.c | 4 +- hw/i386/acpi-microvm.c | 13 ++---- hw/i386/x86.c | 19 ++++---- 22 files changed, 188 insertions(+), 148 deletions(-) create mode 100644 include/hw/acpi/acpi-build-oem.h
Signature · 1 line
2.26.2
PATCH v4 1/1 acpi: Consolidate the handling of OEM ID and OEM Table ID fields
Introduces structure AcpiBuildOem to hold the value of OEM fields and uses dedicated helper functions to initialize/set the values. Unnecessary dynamically allocated OEM fields are re-factored to static allocation.
--- hw/acpi/hmat.h | 2 +- hw/i386/acpi-common.h | 2 +- include/hw/acpi/acpi-build-oem.h | 61 +++++++++++++++++++++++++ include/hw/acpi/aml-build.h | 15 +++--- include/hw/acpi/ghes.h | 2 +- include/hw/acpi/pci.h | 2 +- include/hw/acpi/vmgenid.h | 2 +- include/hw/arm/virt.h | 4 +- include/hw/i386/x86.h | 4 +- include/hw/mem/nvdimm.h | 4 +- hw/acpi/aml-build.c | 27 ++++++----- hw/acpi/ghes.c | 5 +- hw/acpi/hmat.c | 4 +- hw/acpi/nvdimm.c | 22 +++++---- hw/acpi/pci.c | 4 +- hw/acpi/vmgenid.c | 6 ++- hw/arm/virt-acpi-build.c | 40 ++++++---------- hw/arm/virt.c | 16 +++---- hw/i386/acpi-build.c | 78 +++++++++++++++----------------- hw/i386/acpi-common.c | 4 +- hw/i386/acpi-microvm.c | 13 ++---- hw/i386/x86.c | 19 ++++---- 22 files changed, 188 insertions(+), 148 deletions(-) create mode 100644 include/hw/acpi/acpi-build-oem.h
hw/acpi/hmat.h +1 -1
@@ -38,6 +38,6 @@#define HMAT_PROXIMITY_INITIATOR_VALID 0x1void build_hmat (GArray *table_data,BIOSLinker *linker,NumaState *numa_state, -const char *oem_id,const char *oem_table_id); +struct AcpiBuildOem *bld_oem);#endif
hw/i386/acpi-common.h +1 -1
@@ -10,6 +10,6 @@void acpi_build_madt (GArray *table_data,BIOSLinker *linker,X86MachineState *x86ms,AcpiDeviceIf *adev, -const char *oem_id,const char *oem_table_id); +struct AcpiBuildOem *bld_oem);#endif
include/hw/acpi/acpi-build-oem.h new file +61 -0
61 lines not on this page · raw message
include/hw/acpi/aml-build.h +7 -8
@@ -3,9 +3,8 @@#include "hw/acpi/acpi-defs.h" #include "hw/acpi/bios-linker-loader.h" +#include "hw/acpi/acpi-build-oem.h" -#define ACPI_BUILD_APPNAME6 "BOCHS " -#define ACPI_BUILD_APPNAME8 "BXPC "#define ACPI_BUILD_TABLE_FILE "etc/acpi/tables"#define ACPI_BUILD_RSDP_FILE "etc/acpi/rsdp"
@@ -416,7 +415,7 @@ void build_append_int_noprefix(GArray *table, uint64_t value, int size);void build_header (BIOSLinker *linker,GArray *table_data,AcpiTableHeader *h,const char *sig,int len,uint8_t rev, -const char *oem_id,const char *oem_table_id); +struct AcpiBuildOem *bld_oem);void *acpi_data_push (GArray *table_data,unsigned size);unsigned acpi_data_len (GArray *table);void acpi_add_table (GArray *table_offsets,GArray *table_data);
@@ -426,10 +425,10 @@ voidbuild_rsdp (GArray *tbl, BIOSLinker *linker, AcpiRsdpData *rsdp_data);void build_rsdt (GArray *table_data,BIOSLinker *linker,GArray *table_offsets, -const char *oem_id,const char *oem_table_id); +struct AcpiBuildOem *bld_oem);void build_xsdt (GArray *table_data,BIOSLinker *linker,GArray *table_offsets, -const char *oem_id,const char *oem_table_id); +struct AcpiBuildOem *bld_oem);int build_append_named_dword (GArray *array,const char *name_format, ...)
@@ -460,11 +459,11 @@ void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, uint64_t len, int node, MemoryAffinityFlags flags);void build_slit (GArray *table_data,BIOSLinker *linker,MachineState *ms, -const char *oem_id,const char *oem_table_id); +struct AcpiBuildOem *bld_oem);void build_fadt (GArray *tbl,BIOSLinker *linker,const AcpiFadtData *f, -const char *oem_id,const char *oem_table_id); +struct AcpiBuildOem *bld_oem);void build_tpm2 (GArray *table_data,BIOSLinker *linker,GArray *tcpalog, -const char *oem_id,const char *oem_table_id); +struct AcpiBuildOem *bld_oem);#endif
include/hw/acpi/ghes.h +1 -1
@@ -68,7 +68,7 @@ typedef struct AcpiGhesState {void build_ghes_error_table (GArray *hardware_errors,BIOSLinker *linker);void acpi_build_hest (GArray *table_data,BIOSLinker *linker, -const char *oem_id,const char *oem_table_id); +struct AcpiBuildOem *bld_oem);void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors);int acpi_ghes_record_errors (uint8_t notify,uint64_t error_physical_addr);
include/hw/acpi/pci.h +1 -1
@@ -34,6 +34,6 @@ typedef struct AcpiMcfgInfo { } AcpiMcfgInfo;void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info, -const char *oem_id,const char *oem_table_id); +struct AcpiBuildOem *bld_oem);Aml *aml_pci_device_dsm (void );#endif
include/hw/acpi/vmgenid.h +1 -1
@@ -31,7 +31,7 @@ static inline Object *find_vmgenid_dev(void) }void vmgenid_build_acpi (VmGenIdState *vms,GArray *table_data,GArray *guid, -BIOSLinker *linker,const char *oem_id); +BIOSLinker *linker,struct AcpiBuildOem *bld_oem);void vmgenid_add_fw_cfg (VmGenIdState *vms,FWCfgState *s,GArray *guid);#endif
include/hw/arm/virt.h +2 -2
@@ -38,6 +38,7 @@#include "sysemu/kvm.h" #include "hw/intc/arm_gicv3_common.h" #include "qom/object.h" +#include "hw/acpi/acpi-build-oem.h" #define NUM_GICV2M_SPIS 64#define NUM_VIRTIO_TRANSPORTS 32
@@ -164,8 +165,7 @@ struct VirtMachineState {DeviceState *acpi_dev;Notifier powerdown_notifier;PCIBus *bus; -char *oem_id; -char *oem_table_id; +struct AcpiBuildOem bld_oem; };#define VIRT_ECAM_ID (high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM)
include/hw/i386/x86.h +2 -2
@@ -27,6 +27,7 @@#include "hw/isa/isa.h" #include "hw/i386/ioapic.h" #include "qom/object.h" +#include "hw/acpi/acpi-build-oem.h" struct X86MachineClass {/*< private >*/
@@ -67,8 +68,7 @@ struct X86MachineState {OnOffAuto smm;OnOffAuto acpi; -char *oem_id; -char *oem_table_id; +struct AcpiBuildOem bld_oem;/* * Address space used by IOAPIC device. All IOAPIC interrupts * will be translated to MSI messages in the address space.
include/hw/mem/nvdimm.h +2 -2
@@ -154,8 +154,8 @@ void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io,void nvdimm_build_srat (GArray *table_data);void nvdimm_build_acpi (GArray *table_offsets,GArray *table_data,BIOSLinker *linker,NVDIMMState *state, -uint32_t ram_slots,const char *oem_id, -const char *oem_table_id); +uint32_t ram_slots, +struct AcpiBuildOem *bld_oem);void nvdimm_plug (NVDIMMState *state);void nvdimm_acpi_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev);#endif
hw/acpi/aml-build.c +13 -14
@@ -1695,7 +1695,7 @@ Aml *aml_object_type(Aml *object)void build_header (BIOSLinker *linker,GArray *table_data,AcpiTableHeader *h,const char *sig,int len,uint8_t rev, -const char *oem_id,const char *oem_table_id) +struct AcpiBuildOem *bld_oem) {unsigned tbl_offset = (char *)h - table_data->data;unsigned checksum_offset = (char *)&h->checksum - table_data->data;
@@ -1703,9 +1703,9 @@ build_header(BIOSLinker *linker, GArray *table_data, h->length =cpu_to_le32 (len); h->revision = rev; -strpadcpy ((char *)h->oem_id,sizeof h->oem_id, oem_id,' ' ); +strpadcpy ((char *)h->oem_id,sizeof h->oem_id, bld_oem->oem_id,' ' );strpadcpy ((char *)h->oem_table_id,sizeof h->oem_table_id, - oem_table_id,' ' ); + bld_oem->oem_table_id,' ' ); h->oem_revision =cpu_to_le32 (1 );memcpy (h->asl_compiler_id,ACPI_BUILD_APPNAME8 ,4 );
@@ -1825,7 +1825,7 @@ build_rsdp(GArray *tbl, BIOSLinker *linker, AcpiRsdpData *rsdp_data)/* Build rsdt table */ void build_rsdt (GArray *table_data,BIOSLinker *linker,GArray *table_offsets, -const char *oem_id,const char *oem_table_id) +struct AcpiBuildOem *bld_oem) {int i;unsigned rsdt_entries_offset;
@@ -1846,13 +1846,13 @@ build_rsdt(GArray *table_data, BIOSLinker *linker, GArray *table_offsets, ACPI_BUILD_TABLE_FILE, ref_tbl_offset); }build_header (linker, table_data, - (void *)rsdt,"RSDT" , rsdt_len,1 , oem_id, oem_table_id); + (void *)rsdt,"RSDT" , rsdt_len,1 , bld_oem); }/* Build xsdt table */ void build_xsdt (GArray *table_data,BIOSLinker *linker,GArray *table_offsets, -const char *oem_id,const char *oem_table_id) +struct AcpiBuildOem *bld_oem) {int i;unsigned xsdt_entries_offset;
@@ -1873,7 +1873,7 @@ build_xsdt(GArray *table_data, BIOSLinker *linker, GArray *table_offsets, ACPI_BUILD_TABLE_FILE, ref_tbl_offset); }build_header (linker, table_data, - (void *)xsdt,"XSDT" , xsdt_len,1 , oem_id, oem_table_id); + (void *)xsdt,"XSDT" , xsdt_len,1 , bld_oem); } void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base,
@@ -1892,7 +1892,7 @@ void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base,* (Revision 2.0 or later) */ void build_slit (GArray *table_data,BIOSLinker *linker,MachineState *ms, -const char *oem_id,const char *oem_table_id) +struct AcpiBuildOem *bld_oem) {int slit_start, i, j; slit_start = table_data->len;
@@ -1913,12 +1913,12 @@ void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms,build_header (linker, table_data, (void *)(table_data->data + slit_start),"SLIT" , - table_data->len - slit_start,1 , oem_id, oem_table_id); + table_data->len - slit_start,1 , bld_oem); }/* build rev1/rev3/rev5.1 FADT */ void build_fadt (GArray *tbl,BIOSLinker *linker,const AcpiFadtData *f, -const char *oem_id,const char *oem_table_id) +struct AcpiBuildOem *bld_oem) {int off;int fadt_start = tbl->len;
@@ -2037,7 +2037,7 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f, build_hdr:build_header (linker, tbl, (void *)(tbl->data + fadt_start), -"FACP" , tbl->len - fadt_start, f->rev, oem_id, oem_table_id); +"FACP" , tbl->len - fadt_start, f->rev, bld_oem); }/*
@@ -2046,7 +2046,7 @@ build_hdr:* of TCG ACPI Specification, Family “1.2” and “2.0”, Version 1.2, Rev 8 */ void build_tpm2 (GArray *table_data,BIOSLinker *linker,GArray *tcpalog, -const char *oem_id,const char *oem_table_id) +struct AcpiBuildOem *bld_oem) {uint8_t start_method_params[12 ] = {};unsigned log_addr_offset, tpm2_start;
@@ -2095,8 +2095,7 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog, log_addr_offset,8 , ACPI_BUILD_TPMLOG_FILE, 0);build_header (linker, table_data, - tpm2_ptr,"TPM2" , table_data->len - tpm2_start,4 , oem_id, - oem_table_id); + tpm2_ptr,"TPM2" , table_data->len - tpm2_start,4 , bld_oem); } Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set, uint32_t io_offset,
hw/acpi/ghes.c +3 -2
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "qemu/units.h" +#include "hw/acpi/acpi-build-oem.h" #include "hw/acpi/ghes.h" #include "hw/acpi/aml-build.h" #include "qemu/error-report.h"
@@ -360,7 +361,7 @@ static void build_ghes_v2(GArray *table_data, int source_id, BIOSLinker *linker)/* Build Hardware Error Source Table */ void acpi_build_hest (GArray *table_data,BIOSLinker *linker, -const char *oem_id,const char *oem_table_id) +struct AcpiBuildOem *bld_oem) {uint64_t hest_start = table_data->len;
@@ -373,7 +374,7 @@ void acpi_build_hest(GArray *table_data, BIOSLinker *linker,build_ghes_v2 (table_data,ACPI_HEST_SRC_ID_SEA , linker);build_header (linker, table_data, (void *)(table_data->data + hest_start), -"HEST" , table_data->len - hest_start,1 , oem_id, oem_table_id); +"HEST" , table_data->len - hest_start,1 , bld_oem); } void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,
hw/acpi/hmat.c +2 -2
@@ -254,7 +254,7 @@ static void hmat_build_table_structs(GArray *table_data, NumaState *numa_state) }void build_hmat (GArray *table_data,BIOSLinker *linker,NumaState *numa_state, -const char *oem_id,const char *oem_table_id) +struct AcpiBuildOem *bld_oem) {int hmat_start = table_data->len;
@@ -265,5 +265,5 @@ void build_hmat(GArray *table_data, BIOSLinker *linker, NumaState *numa_state,build_header (linker, table_data, (void *)(table_data->data + hmat_start), -"HMAT" , table_data->len - hmat_start,2 , oem_id, oem_table_id); +"HMAT" , table_data->len - hmat_start,2 , bld_oem); }
hw/acpi/nvdimm.c +12 -10
@@ -403,7 +403,7 @@ void nvdimm_plug(NVDIMMState *state)static void nvdimm_build_nfit (NVDIMMState *state,GArray *table_offsets,GArray *table_data,BIOSLinker *linker, -const char *oem_id,const char *oem_table_id) +struct AcpiBuildOem *bld_oem) {NvdimmFitBuffer *fit_buf = &state->fit_buf;unsigned int header;
@@ -418,8 +418,7 @@ static void nvdimm_build_nfit(NVDIMMState *state, GArray *table_offsets,build_header (linker, table_data, (void *)(table_data->data + header),"NFIT" , -sizeof (NvdimmNfitHeader) + fit_buf->fit->len,1 , oem_id, - oem_table_id); +sizeof (NvdimmNfitHeader) + fit_buf->fit->len,1 , bld_oem); }#define NVDIMM_DSM_MEMORY_SIZE 4096
@@ -1280,9 +1279,11 @@ static void nvdimm_build_nvdimm_devices(Aml *root_dev, uint32_t ram_slots)static void nvdimm_build_ssdt (GArray *table_offsets,GArray *table_data,BIOSLinker *linker,NVDIMMState *nvdimm_state, -uint32_t ram_slots,const char *oem_id) +uint32_t ram_slots, +struct AcpiBuildOem *bld_oem) {Aml *ssdt, *sb_scope, *dev; +struct AcpiBuildOem tmp_bld_oem;int mem_addr_offset, nvdimm_ssdt;acpi_add_table (table_offsets, table_data);
@@ -1331,9 +1332,11 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,bios_linker_loader_add_pointer (linker,ACPI_BUILD_TABLE_FILE , mem_addr_offset,sizeof (uint32_t ),NVDIMM_DSM_MEM_FILE ,0 ); + +ACPI_BUILD_OEM_INIT (&tmp_bld_oem, bld_oem->oem_id,"NVDIMM" );build_header (linker, table_data, - (void *)(table_data->data + nvdimm_ssdt), -"SSDT" , table_data->len - nvdimm_ssdt,1 , oem_id,"NVDIMM" ); + (void *)(table_data->data + nvdimm_ssdt), +"SSDT" , table_data->len - nvdimm_ssdt,1 , &tmp_bld_oem);free_aml_allocator (); }
@@ -1361,8 +1364,7 @@ void nvdimm_build_srat(GArray *table_data)void nvdimm_build_acpi (GArray *table_offsets,GArray *table_data,BIOSLinker *linker,NVDIMMState *state, -uint32_t ram_slots,const char *oem_id, -const char *oem_table_id) +uint32_t ram_slots,struct AcpiBuildOem *bld_oem) {GSList *device_list;
@@ -1372,7 +1374,7 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data, }nvdimm_build_ssdt (table_offsets, table_data, linker, state, - ram_slots, oem_id); + ram_slots, bld_oem); device_list =nvdimm_get_device_list ();/* no NVDIMM device is plugged. */
@@ -1381,6 +1383,6 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data, }nvdimm_build_nfit (state, table_offsets, table_data, linker, - oem_id, oem_table_id); + bld_oem);g_slist_free (device_list); }
hw/acpi/pci.c +2 -2
@@ -29,7 +29,7 @@#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) +struct AcpiBuildOem *bld_oem) {int mcfg_start = table_data->len;
@@ -57,5 +57,5 @@ void build_mcfg(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info,build_append_int_noprefix (table_data,0 ,4 );build_header (linker, table_data, (void *)(table_data->data + mcfg_start), -"MCFG" , table_data->len - mcfg_start,1 , oem_id, oem_table_id); +"MCFG" , table_data->len - mcfg_start,1 , bld_oem); }
hw/acpi/vmgenid.c +4 -2
@@ -24,11 +24,12 @@#include "sysemu/reset.h" void vmgenid_build_acpi (VmGenIdState *vms,GArray *table_data,GArray *guid, -BIOSLinker *linker,const char *oem_id) +BIOSLinker *linker,struct AcpiBuildOem *bld_oem) {Aml *ssdt, *dev, *scope, *method, *addr, *if_ctx;uint32_t vgia_offset;QemuUUID guid_le; +struct AcpiBuildOem tmp_bld_oem;/* Fill in the GUID values. These need to be converted to little-endian * first, since that's what the guest expects
@@ -116,9 +117,10 @@ 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); +ACPI_BUILD_OEM_INIT (&tmp_bld_oem, bld_oem->oem_id,"VMGENID" );build_header (linker, table_data, (void *)(table_data->data + table_data->len - ssdt->buf->len), -"SSDT" , ssdt->buf->len,1 , oem_id,"VMGENID" ); +"SSDT" , ssdt->buf->len,1 , &tmp_bld_oem);free_aml_allocator (); }
hw/arm/virt-acpi-build.c +14 -26
@@ -341,8 +341,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) iort->length =cpu_to_le32 (iort_length);build_header (linker, table_data, (void *)(table_data->data + iort_start), -"IORT" , table_data->len - iort_start,0 , vms->oem_id, - vms->oem_table_id); +"IORT" , table_data->len - iort_start,0 , &vms->bld_oem); } static void
@@ -376,8 +375,7 @@ build_spcr(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) spcr->pci_vendor_id =0xffff ;/* PCI Vendor ID: not a PCI device */ build_header (linker, table_data, (void *)(table_data->data + spcr_start), -"SPCR" , table_data->len - spcr_start,2 , vms->oem_id, - vms->oem_table_id); +"SPCR" , table_data->len - spcr_start,2 , &vms->bld_oem); } static void
@@ -429,8 +427,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) }build_header (linker, table_data, (void *)(table_data->data + srat_start), -"SRAT" , table_data->len - srat_start,3 , vms->oem_id, - vms->oem_table_id); +"SRAT" , table_data->len - srat_start,3 , &vms->bld_oem); }/* GTDT */
@@ -465,8 +462,7 @@ build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)build_header (linker, table_data, (void *)(table_data->data + gtdt_start),"GTDT" , - table_data->len - gtdt_start,2 , vms->oem_id, - vms->oem_table_id); + table_data->len - gtdt_start,2 , &vms->bld_oem); }/* MADT */
@@ -555,8 +551,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)build_header (linker, table_data, (void *)(table_data->data + madt_start),"APIC" , - table_data->len - madt_start,3 , vms->oem_id, - vms->oem_table_id); + table_data->len - madt_start,3 , &vms->bld_oem); }/* FADT */
@@ -586,7 +581,7 @@ static void build_fadt_rev5(GArray *table_data, BIOSLinker *linker,g_assert_not_reached (); } -build_fadt (table_data, linker, &fadt, vms->oem_id, vms->oem_table_id); +build_fadt (table_data, linker, &fadt, &vms->bld_oem); }/* DSDT */
@@ -650,8 +645,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)g_array_append_vals (table_data, dsdt->buf->data, dsdt->buf->len);build_header (linker, table_data, (void *)(table_data->data + table_data->len - dsdt->buf->len), -"DSDT" , dsdt->buf->len,2 , vms->oem_id, - vms->oem_table_id); +"DSDT" , dsdt->buf->len,2 , &vms->bld_oem);free_aml_allocator (); }
@@ -710,8 +704,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) .base = vms->memmap[VIRT_ECAM_ID(vms->highmem_ecam)].base, .size = vms->memmap[VIRT_ECAM_ID(vms->highmem_ecam)].size, }; -build_mcfg (tables_blob, tables->linker, &mcfg, vms->oem_id, - vms->oem_table_id); +build_mcfg (tables_blob, tables->linker, &mcfg, &vms->bld_oem); }acpi_add_table (table_offsets, tables_blob);
@@ -720,8 +713,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)if (vms->ras) {build_ghes_error_table (tables->hardware_errors, tables->linker);acpi_add_table (table_offsets, tables_blob); -acpi_build_hest (tables_blob, tables->linker, vms->oem_id, - vms->oem_table_id); +acpi_build_hest (tables_blob, tables->linker, &vms->bld_oem); }if (ms->numa_state->num_nodes >0 ) {
@@ -729,15 +721,13 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)build_srat (tables_blob, tables->linker, vms);if (ms->numa_state->have_numa_distance) {acpi_add_table (table_offsets, tables_blob); -build_slit (tables_blob, tables->linker, ms, vms->oem_id, - vms->oem_table_id); +build_slit (tables_blob, tables->linker, ms, &vms->bld_oem); } }if (ms->nvdimms_state->is_enabled) {nvdimm_build_acpi (table_offsets, tables_blob, tables->linker, - ms->nvdimms_state, ms->ram_slots, vms->oem_id, - vms->oem_table_id); + ms->nvdimms_state, ms->ram_slots, &vms->bld_oem); }if (its_class_name () && !vmc->no_its) {
@@ -747,20 +737,18 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)if (tpm_get_version (tpm_find ()) ==TPM_VERSION_2_0 ) {acpi_add_table (table_offsets, tables_blob); -build_tpm2 (tables_blob, tables->linker, tables->tcpalog, vms->oem_id, - vms->oem_table_id); +build_tpm2 (tables_blob, tables->linker, tables->tcpalog, &vms->bld_oem); }/* XSDT is pointed to by RSDP */ xsdt = tables_blob->len; -build_xsdt (tables_blob, tables->linker, table_offsets, vms->oem_id, - vms->oem_table_id); +build_xsdt (tables_blob, tables->linker, table_offsets, &vms->bld_oem);/* RSDP is in FSEG memory, so allocate it separately */ {AcpiRsdpData rsdp_data = { .revision =2 , - .oem_id = vms->oem_id, + .oem_id = vms->bld_oem.oem_id, .xsdt_tbl_offset = &xsdt, .rsdt_tbl_offset =NULL , };
hw/arm/virt.c +7 -9
@@ -2173,7 +2173,7 @@ static char *virt_get_oem_id(Object *obj, Error **errp) {VirtMachineState *vms =VIRT_MACHINE (obj); -return g_strdup (vms->oem_id); +return g_strdup (vms->bld_oem.oem_id); }static void virt_set_oem_id (Object *obj,const char *value,Error **errp)
@@ -2181,20 +2181,19 @@ static void virt_set_oem_id(Object *obj, const char *value, Error **errp)VirtMachineState *vms =VIRT_MACHINE (obj);size_t len =strlen (value); -if (len >6 ) { +if (len >ACPI_BUILD_OEM_ID_SIZE ) {error_setg (errp,"User specified oem-id value is bigger than 6 bytes in size" );return ; } - -strncpy (vms->oem_id, value,6 ); +ACPI_BUILD_OEM_SET_ID (&vms->bld_oem, value); }static char *virt_get_oem_table_id (Object *obj,Error **errp) {VirtMachineState *vms =VIRT_MACHINE (obj); -return g_strdup (vms->oem_table_id); +return g_strdup (vms->bld_oem.oem_table_id); } static void virt_set_oem_table_id(Object *obj, const char *value,
@@ -2203,12 +2202,12 @@ static void virt_set_oem_table_id(Object *obj, const char *value,VirtMachineState *vms =VIRT_MACHINE (obj);size_t len =strlen (value); -if (len >8 ) { +if (len >ACPI_BUILD_OEM_TABLE_ID_SIZE ) {error_setg (errp,"User specified oem-table-id value is bigger than 8 bytes in size" );return ; } -strncpy (vms->oem_table_id, value,8 ); +ACPI_BUILD_OEM_SET_TABLE_ID (&vms->bld_oem, value); }
@@ -2729,8 +2728,7 @@ static void virt_instance_init(Object *obj)virt_flash_create (vms); - vms->oem_id =g_strndup (ACPI_BUILD_APPNAME6 ,6 ); - vms->oem_table_id =g_strndup (ACPI_BUILD_APPNAME8 ,8 ); +ACPI_BUILD_OEM_INIT_DEFAULT (&vms->bld_oem); }static const TypeInfo virt_machine_info = {
hw/i386/acpi-build.c +37 -41
238 lines not on this page · raw message
hw/i386/acpi-common.c +2 -2
@@ -73,7 +73,7 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,void acpi_build_madt (GArray *table_data,BIOSLinker *linker,X86MachineState *x86ms,AcpiDeviceIf *adev, -const char *oem_id,const char *oem_table_id) +struct AcpiBuildOem *bld_oem) {MachineClass *mc =MACHINE_GET_CLASS (x86ms);const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids (MACHINE (x86ms));
@@ -158,6 +158,6 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,build_header (linker, table_data, (void *)(table_data->data + madt_start),"APIC" , - table_data->len - madt_start,1 , oem_id, oem_table_id); + table_data->len - madt_start,1 , bld_oem); }
hw/i386/acpi-microvm.c +5 -8
@@ -149,7 +149,7 @@ build_dsdt_microvm(GArray *table_data, BIOSLinker *linker,g_array_append_vals (table_data, dsdt->buf->data, dsdt->buf->len);build_header (linker, table_data, (void *)(table_data->data + table_data->len - dsdt->buf->len), -"DSDT" , dsdt->buf->len,2 , x86ms->oem_id, x86ms->oem_table_id); +"DSDT" , dsdt->buf->len,2 , &x86ms->bld_oem);free_aml_allocator (); }
@@ -201,24 +201,21 @@ static void acpi_build_microvm(AcpiBuildTables *tables, pmfadt.dsdt_tbl_offset = &dsdt; pmfadt.xdsdt_tbl_offset = &dsdt;acpi_add_table (table_offsets, tables_blob); -build_fadt (tables_blob, tables->linker, &pmfadt, x86ms->oem_id, - x86ms->oem_table_id); +build_fadt (tables_blob, tables->linker, &pmfadt, &x86ms->bld_oem);acpi_add_table (table_offsets, tables_blob);acpi_build_madt (tables_blob, tables->linker,X86_MACHINE (machine), -ACPI_DEVICE_IF (x86ms->acpi_dev), x86ms->oem_id, - x86ms->oem_table_id); +ACPI_DEVICE_IF (x86ms->acpi_dev), &x86ms->bld_oem); xsdt = tables_blob->len; -build_xsdt (tables_blob, tables->linker, table_offsets, x86ms->oem_id, - x86ms->oem_table_id); +build_xsdt (tables_blob, tables->linker, table_offsets, &x86ms->bld_oem);/* RSDP is in FSEG memory, so allocate it separately */ {AcpiRsdpData rsdp_data = {/* ACPI 2.0: 5.2.4.3 RSDP Structure */ .revision =2 ,/* xsdt needs v2 */ - .oem_id = x86ms->oem_id, + .oem_id = x86ms->bld_oem.oem_id, .xsdt_tbl_offset = &xsdt, .rsdt_tbl_offset =NULL , };
hw/i386/x86.c +8 -11
@@ -1205,7 +1205,7 @@ static char *x86_machine_get_oem_id(Object *obj, Error **errp) {X86MachineState *x86ms =X86_MACHINE (obj); -return g_strdup (x86ms->oem_id); +return g_strdup (x86ms->bld_oem.oem_id); }static void x86_machine_set_oem_id (Object *obj,const char *value,Error **errp)
@@ -1213,21 +1213,20 @@ static void x86_machine_set_oem_id(Object *obj, const char *value, Error **errp)X86MachineState *x86ms =X86_MACHINE (obj);size_t len =strlen (value); -if (len >6 ) { +if (len >ACPI_BUILD_OEM_ID_SIZE ) {error_setg (errp,"User specified " X86_MACHINE_OEM_ID " value is bigger than " "6 bytes in size" );return ; } - -strncpy (x86ms->oem_id, value,6 ); +ACPI_BUILD_OEM_SET_ID (&x86ms->bld_oem, value); }static char *x86_machine_get_oem_table_id (Object *obj,Error **errp) {X86MachineState *x86ms =X86_MACHINE (obj); -return g_strdup (x86ms->oem_table_id); +return g_strdup (x86ms->bld_oem.oem_table_id); } static void x86_machine_set_oem_table_id(Object *obj, const char *value,
@@ -1236,14 +1235,13 @@ static void x86_machine_set_oem_table_id(Object *obj, const char *value,X86MachineState *x86ms =X86_MACHINE (obj);size_t len =strlen (value); -if (len >8 ) { +if (len >ACPI_BUILD_OEM_TABLE_ID_SIZE ) {error_setg (errp,"User specified " X86_MACHINE_OEM_TABLE_ID -" value is bigger than " -"8 bytes in size" ); +" value is bigger than 8 bytes in size" );return ; } -strncpy (x86ms->oem_table_id, value,8 ); +ACPI_BUILD_OEM_SET_TABLE_ID (&x86ms->bld_oem, value); }static void x86_machine_initfn (Object *obj)
@@ -1254,8 +1252,7 @@ static void x86_machine_initfn(Object *obj) x86ms->acpi =ON_OFF_AUTO_AUTO ; x86ms->smp_dies =1 ; x86ms->pci_irq_mask =ACPI_BUILD_PCI_IRQS ; - x86ms->oem_id =g_strndup (ACPI_BUILD_APPNAME6 ,6 ); - x86ms->oem_table_id =g_strndup (ACPI_BUILD_APPNAME8 ,8 ); +ACPI_BUILD_OEM_INIT_DEFAULT (&x86ms->bld_oem); }static void x86_machine_class_init (ObjectClass *oc,void *data)
Signature · 1 line
2.26.2
Quoted 7 lines · Marian Postevca
This patch consolidates ACPI OEM fields handling
by:
- Moving common code in PC and MICROVM to X86.
- Changes unnecessary dynamic memory allocation to static allocation
- Uses dedicated structure to keep values of fields instead of two separate strings
- Adds helper functions to initialize the structure
I'd like to apply this, could you please rebase on top of my tree? Conflicts with some changes there.
Quoted 51 lines
v2:
- Move the setters/getters of OEM fields to X86MachineState to remove duplication
- Change commit message to make it clear the second commit is a re-factorv3:
- Rebase "acpi: Consolidate the handling of OEM ID and OEM Table ID fields to latest" to latest HEAD
- Dropped "acpi: Move setters/getters of oem fields to X86MachineState" since it was accepted alreadyv4:
- Drop helper macros and use static inline functions instead
- Removed variables starting with __
- Used consistent naming for helper functions that start with ACPI_BUILD_OEM_*
- Didn't drop the definesACPI_BUILD_APPNAME6andACPI_BUILD_APPNAME8sinceACPI_BUILD_APPNAME8is still used inbuild_header()inaml-build.cand it feels better to keep them defined together. But if others prefer to drop theACPI_BUILD_APPNAME6define, will resend the patch.Marian Postevca (1):
acpi: Consolidate the handling of OEM ID and OEM Table ID fieldshw/acpi/hmat.h | 2 +- hw/i386/acpi-common.h | 2 +- include/hw/acpi/acpi-build-oem.h | 61 +++++++++++++++++++++++++ include/hw/acpi/aml-build.h | 15 +++--- include/hw/acpi/ghes.h | 2 +- include/hw/acpi/pci.h | 2 +- include/hw/acpi/vmgenid.h | 2 +- include/hw/arm/virt.h | 4 +- include/hw/i386/x86.h | 4 +- include/hw/mem/nvdimm.h | 4 +- hw/acpi/aml-build.c | 27 ++++++----- hw/acpi/ghes.c | 5 +- hw/acpi/hmat.c | 4 +- hw/acpi/nvdimm.c | 22 +++++---- hw/acpi/pci.c | 4 +- hw/acpi/vmgenid.c | 6 ++- hw/arm/virt-acpi-build.c | 40 ++++++---------- hw/arm/virt.c | 16 +++---- hw/i386/acpi-build.c | 78 +++++++++++++++----------------- hw/i386/acpi-common.c | 4 +- hw/i386/acpi-microvm.c | 13 ++---- hw/i386/x86.c | 19 ++++---- 22 files changed, 188 insertions(+), 148 deletions(-) create mode 100644 include/hw/acpi/acpi-build-oem.hSignature · 1 line
2.26.2