From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJTu2-0006EL-7S for qemu-devel@nongnu.org; Sun, 04 Nov 2018 20:42:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJTtv-0001ed-EG for qemu-devel@nongnu.org; Sun, 04 Nov 2018 20:42:04 -0500 From: Samuel Ortiz Date: Mon, 5 Nov 2018 02:40:27 +0100 Message-Id: <20181105014047.26447-5-sameo@linux.intel.com> In-Reply-To: <20181105014047.26447-1-sameo@linux.intel.com> References: <20181105014047.26447-1-sameo@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v5 04/24] hw: acpi: Export the RSDP build API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Shannon Zhao , Stefano Stabellini , Anthony Perard , Richard Henderson , Marcel Apfelbaum , xen-devel@lists.xenproject.org, Paolo Bonzini , "Michael S. Tsirkin" , Igor Mammedov , qemu-arm@nongnu.org, Peter Maydell , Eduardo Habkost The hardware-reduced API will need to build RSDP as well, so we should export this routine. Signed-off-by: Samuel Ortiz --- include/hw/acpi/aml-build.h | 3 +++ hw/arm/virt-acpi-build.c | 2 +- hw/i386/acpi-build.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 73fc6659f2..c9bcb32d81 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -390,6 +390,9 @@ 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_rsdp(GArray *table_data, + BIOSLinker *linker, unsigned rsdt_tbl_offset); +void build_rsdt(GArray *table_data, BIOSLinker *linker, GArray *table_offsets, const char *oem_id, const char *oem_table_id); void diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index fc59cce769..623a6c4eac 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -367,7 +367,7 @@ static void acpi_dsdt_add_power_button(Aml *scope) } /* RSDP */ -static void +void build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) { AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp); diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 74419d0663..f7a67f5c9c 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2513,7 +2513,7 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker) "IVRS", table_data->len - iommu_start, 1, NULL, NULL); } -static void +void build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset) { AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp); -- 2.19.1