[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 39/49] acpi: expose oem_id and oem_table_id in build_
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 39/49] acpi: expose oem_id and oem_table_id in build_rsdt() |
Date: |
Thu, 4 Feb 2016 23:53:34 +0200 |
From: Laszlo Ersek <address@hidden>
Since build_rsdt() is implemented as common utility code (in
"hw/acpi/aml-build.c"), it should expose -- and forward -- the oem_id and
oem_table_id parameters between board code and the generic build_header()
function.
Cc: "Michael S. Tsirkin" <address@hidden> (supporter:ACPI/SMBIOS)
Cc: Igor Mammedov <address@hidden> (supporter:ACPI/SMBIOS)
Cc: Shannon Zhao <address@hidden> (maintainer:ARM ACPI Subsystem)
Cc: Paolo Bonzini <address@hidden> (maintainer:X86)
Cc: Richard W.M. Jones <address@hidden>
Cc: Aleksei Kovura <address@hidden>
Cc: Michael Tokarev <address@hidden>
Cc: Steven Newbury <address@hidden>
RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1248758
LP: https://bugs.launchpad.net/qemu/+bug/1533848
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Shannon Zhao <address@hidden>
---
include/hw/acpi/aml-build.h | 3 ++-
hw/acpi/aml-build.c | 5 +++--
hw/arm/virt-acpi-build.c | 2 +-
hw/i386/acpi-build.c | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
index c460bdd..aa29d30 100644
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -364,6 +364,7 @@ void acpi_add_table(GArray *table_offsets, GArray
*table_data);
void acpi_build_tables_init(AcpiBuildTables *tables);
void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre);
void
-build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets);
+build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets,
+ const char *oem_id, const char *oem_table_id);
#endif
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index e4b6c0c..603068b 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -1492,7 +1492,8 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables,
bool mfre)
/* Build rsdt table */
void
-build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets)
+build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets,
+ const char *oem_id, const char *oem_table_id)
{
AcpiRsdtDescriptorRev1 *rsdt;
size_t rsdt_len;
@@ -1511,5 +1512,5 @@ build_rsdt(GArray *table_data, GArray *linker, GArray
*table_offsets)
sizeof(uint32_t));
}
build_header(linker, table_data,
- (void *)rsdt, "RSDT", rsdt_len, 1, NULL, NULL);
+ (void *)rsdt, "RSDT", rsdt_len, 1, oem_id, oem_table_id);
}
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 8017b12..560764f 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -643,7 +643,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info,
AcpiBuildTables *tables)
/* RSDT is pointed to by RSDP */
rsdt = tables_blob->len;
- build_rsdt(tables_blob, tables->linker, table_offsets);
+ build_rsdt(tables_blob, tables->linker, table_offsets, NULL, NULL);
/* RSDP is in FSEG memory, so allocate it separately */
build_rsdp(tables->rsdp, tables->linker, rsdt);
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 061a9cb..705d12f 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2681,7 +2681,7 @@ void acpi_build(AcpiBuildTables *tables)
/* RSDT is pointed to by RSDP */
rsdt = tables_blob->len;
- build_rsdt(tables_blob, tables->linker, table_offsets);
+ build_rsdt(tables_blob, tables->linker, table_offsets, NULL, NULL);
/* RSDP is in FSEG memory, so allocate it separately */
build_rsdp(tables->rsdp, tables->linker, rsdt);
--
MST
- [Qemu-devel] [PULL 30/49] acpi: Remove guest_info parameters from functions, (continued)
- [Qemu-devel] [PULL 30/49] acpi: Remove guest_info parameters from functions, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 31/49] acpi: Don't save PcGuestInfo on AcpiBuildState, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 32/49] pc: Remove compat fields from PcGuestInfo, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 34/49] pc: Remove PcGuestInfo.isapc_ram_fw field, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 35/49] pc: Move PcGuestInfo.fw_cfg to PCMachineState, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 33/49] pc: Remove RAM size fields from PcGuestInfo, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 37/49] pc: Eliminate PcGuestInfo struct, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 36/49] pc: Move APIC and NUMA data from PcGuestInfo to PCMachineState, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 38/49] acpi: take oem_id in build_header(), optionally, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 39/49] acpi: expose oem_id and oem_table_id in build_rsdt(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 40/49] acpi: add function to extract oem_id and oem_table_id from the user's SLIC, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 41/49] pc: set the OEM fields in the RSDT and the FADT from the SLIC, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 42/49] dimm: Correct type of MemoryHotplugState->base, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 43/49] intel_iommu: large page support, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 44/49] fix MSI injection on Xen, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 45/49] net: set endianness on all backend devices, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 46/49] i386/acpi: make floppy controller object dynamic, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 48/49] i386: populate floppy drive information in DSDT, Michael S. Tsirkin, 2016/02/04