From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z285d-0002QA-3k for qemu-devel@nongnu.org; Mon, 08 Jun 2015 21:12:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z285a-0000o6-4V for qemu-devel@nongnu.org; Mon, 08 Jun 2015 21:12:29 -0400 Received: from mail-yk0-x22b.google.com ([2607:f8b0:4002:c07::22b]:35286) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z285Z-0000o0-Vs for qemu-devel@nongnu.org; Mon, 08 Jun 2015 21:12:26 -0400 Received: by yken206 with SMTP id n206so1977654yke.2 for ; Mon, 08 Jun 2015 18:12:25 -0700 (PDT) Sender: Corey Minyard From: minyard@acm.org Date: Mon, 8 Jun 2015 20:12:07 -0500 Message-Id: <1433812331-18993-13-git-send-email-minyard@acm.org> In-Reply-To: <1433812331-18993-1-git-send-email-minyard@acm.org> References: <1433812331-18993-1-git-send-email-minyard@acm.org> Subject: [Qemu-devel] [PATCH v3 12/16] pc: Postpone SMBIOS table installation to post machine init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Corey Minyard From: Corey Minyard This is the same place that the ACPI SSDT table gets added, so that devices can add themselves to the SMBIOS table. Signed-off-by: Corey Minyard --- hw/i386/pc.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a8e6be1..efe3c2f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -680,8 +680,6 @@ static unsigned int pc_apic_id_limit(unsigned int max_cpus) static FWCfgState *bochs_bios_init(void) { FWCfgState *fw_cfg; - uint8_t *smbios_tables, *smbios_anchor; - size_t smbios_tables_len, smbios_anchor_len; uint64_t *numa_fw_cfg; int i, j; unsigned int apic_id_limit = pc_apic_id_limit(max_cpus); @@ -707,21 +705,6 @@ static FWCfgState *bochs_bios_init(void) acpi_tables, acpi_tables_len); fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, kvm_allows_irq0_override()); - smbios_tables = smbios_get_table_legacy(&smbios_tables_len); - if (smbios_tables) { - fw_cfg_add_bytes(fw_cfg, FW_CFG_SMBIOS_ENTRIES, - smbios_tables, smbios_tables_len); - } - - smbios_get_tables(&smbios_tables, &smbios_tables_len, - &smbios_anchor, &smbios_anchor_len); - if (smbios_anchor) { - fw_cfg_add_file(fw_cfg, "etc/smbios/smbios-tables", - smbios_tables, smbios_tables_len); - fw_cfg_add_file(fw_cfg, "etc/smbios/smbios-anchor", - smbios_anchor, smbios_anchor_len); - } - fw_cfg_add_bytes(fw_cfg, FW_CFG_E820_TABLE, &e820_reserve, sizeof(e820_reserve)); fw_cfg_add_file(fw_cfg, "etc/e820", e820_table, @@ -1119,7 +1102,25 @@ void pc_guest_info_machine_done(Notifier *notifier, void *data) PcGuestInfoState *guest_info_state = container_of(notifier, PcGuestInfoState, machine_done); + uint8_t *smbios_tables, *smbios_anchor; + size_t smbios_tables_len, smbios_anchor_len; + FWCfgState *fw_cfg = guest_info_state->info.fw_cfg; + acpi_setup(&guest_info_state->info); + + smbios_tables = smbios_get_table_legacy(&smbios_tables_len); + if (smbios_tables) { + fw_cfg_add_bytes(fw_cfg, FW_CFG_SMBIOS_ENTRIES, + smbios_tables, smbios_tables_len); + } + smbios_get_tables(&smbios_tables, &smbios_tables_len, + &smbios_anchor, &smbios_anchor_len); + if (smbios_anchor) { + fw_cfg_add_file(fw_cfg, "etc/smbios/smbios-tables", + smbios_tables, smbios_tables_len); + fw_cfg_add_file(fw_cfg, "etc/smbios/smbios-anchor", + smbios_anchor, smbios_anchor_len); + } } PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size, -- 1.8.3.1