Commit 51513558 authored by Laszlo Ersek's avatar Laszlo Ersek Committed by Michael S. Tsirkin
Browse files

acpi: expose oem_id and oem_table_id in build_rsdt() 

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" <mst@redhat.com> (supporter:ACPI/SMBIOS)
Cc: Igor Mammedov <imammedo@redhat.com> (supporter:ACPI/SMBIOS)
Cc: Shannon Zhao <zhaoshenglong@huawei.com> (maintainer:ARM ACPI Subsystem)
Cc: Paolo Bonzini <pbonzini@redhat.com> (maintainer:X86)
Cc: Richard W.M. Jones <rjones@redhat.com>
Cc: Aleksei Kovura <alex3kov@zoho.com>
Cc: Michael Tokarev <mjt@tls.msk.ru>
Cc: Steven Newbury <steve@snewbury.org.uk>
RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1248758
LP: https://bugs.launchpad.net/qemu/+bug/1533848


Signed-off-by: default avatarLaszlo Ersek <lersek@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarShannon Zhao <shannon.zhao@linaro.org>
parent 37ad223c

hw/acpi/aml-build.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

}

hw/arm/virt-acpi-build.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

hw/i386/acpi-build.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/hw/acpi/aml-build.h

+2 −1
Original line number Diff line number Diff line
@@ -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