From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4tqL-00018J-Bb for qemu-devel@nongnu.org; Mon, 23 May 2016 13:40:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b4tqA-0001oc-Nq for qemu-devel@nongnu.org; Mon, 23 May 2016 13:40:40 -0400 Received: from mail-pa0-x243.google.com ([2607:f8b0:400e:c03::243]:33002) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4tqA-0001oS-Gy for qemu-devel@nongnu.org; Mon, 23 May 2016 13:40:30 -0400 Received: by mail-pa0-x243.google.com with SMTP id f8so6751951pag.0 for ; Mon, 23 May 2016 10:40:30 -0700 (PDT) Sender: Corey Minyard From: minyard@acm.org Date: Mon, 23 May 2016 12:40:13 -0500 Message-Id: <1464025217-24054-3-git-send-email-minyard@acm.org> In-Reply-To: <1464025217-24054-1-git-send-email-minyard@acm.org> References: <1464025217-24054-1-git-send-email-minyard@acm.org> Subject: [Qemu-devel] [PATCH v6 2/6] pc: Postpone SMBIOS table installation to post machine init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov , "Michael S . Tsirkin" , Paolo Bonzini , qemu-devel@nongnu.org, minyard@acm.org, cminyard@mvista.com 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 99437e0..c2bc4af 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -764,8 +764,6 @@ static FWCfgState *bochs_bios_init(AddressSpace *as, PCMachineState *pcms) acpi_tables, acpi_tables_len); fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, kvm_allows_irq0_override()); - pc_build_smbios(fw_cfg); - 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, @@ -1181,6 +1179,9 @@ void pc_machine_done(Notifier *notifier, void *data) } acpi_setup(); + if (pcms->fw_cfg) { + pc_build_smbios(pcms->fw_cfg); + } } void pc_guest_info_init(PCMachineState *pcms) -- 2.7.4