> On Feb 15, 2017, at 6:30 AM, Laszlo Ersek wrote: > > On 02/15/17 07:15, ben@skyportsystems.com wrote: >> From: Ben Warren >> >> This allows them to be centrally initialized and destroyed >> >> The "AcpiBuildTables.vmgenid" array will be used to construct the >> "etc/vmgenid" fw_cfg blob. > > Trivial wart: the blob is now called "etc/vmgenid_guid". > > If you send a v7, feel free to fix it up. Not critical. > Fixed in v7 > My R-b stands. > > Thanks! > Laszlo > >> 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 >> Reviewed-by: Laszlo Ersek >> --- >> hw/acpi/aml-build.c | 2 ++ >> include/hw/acpi/aml-build.h | 1 + >> 2 files changed, 3 insertions(+) >> >> 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; >> >> >