| Message ID | 06770233aa4bcf873f68632f1c60c6fa91b02779.1487224954.git.ben@skyportsystems.com |
|---|---|
| State | New |
| Headers | show |
On 02/16/17 07:18, ben@skyportsystems.com wrote: > From: Ben Warren <ben@skyportsystems.com> > > This allows them to be centrally initialized and destroyed > > The "AcpiBuildTables.vmgenid" array will be used to construct the > "etc/vmgenid_guid" fw_cfg blob. > > Its contents will be linked into fw_cfg after being built on the > pc_machine_done() -> acpi_setup() -> acpi_build() call path, and dropped > without use on the subsequent, guest triggered, acpi_build_update() -> > acpi_build() call path. > > Signed-off-by: Ben Warren <ben@skyportsystems.com> > Reviewed-by: Laszlo Ersek <lersek@redhat.com> > Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/acpi/aml-build.c | 2 ++ > include/hw/acpi/aml-build.h | 1 + > 2 files changed, 3 insertions(+) Tested-by: Laszlo Ersek <lersek@redhat.com>
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index b2a1e40..c6f2032 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1559,6 +1559,7 @@ void acpi_build_tables_init(AcpiBuildTables *tables) tables->rsdp = g_array_new(false, true /* clear */, 1); tables->table_data = g_array_new(false, true /* clear */, 1); tables->tcpalog = g_array_new(false, true /* clear */, 1); + tables->vmgenid = g_array_new(false, true /* clear */, 1); tables->linker = bios_linker_loader_init(); } @@ -1568,6 +1569,7 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre) g_array_free(tables->rsdp, true); g_array_free(tables->table_data, true); g_array_free(tables->tcpalog, mfre); + g_array_free(tables->vmgenid, mfre); } /* Build rsdt table */ diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 559326c..00c21f1 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -210,6 +210,7 @@ struct AcpiBuildTables { GArray *table_data; GArray *rsdp; GArray *tcpalog; + GArray *vmgenid; BIOSLinker *linker; } AcpiBuildTables;