From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9Xzp-0002vn-GC for qemu-devel@nongnu.org; Sun, 05 Jun 2016 09:21:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9Xzn-0004xx-Iw for qemu-devel@nongnu.org; Sun, 05 Jun 2016 09:21:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50984) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9Xzn-0004xt-DF for qemu-devel@nongnu.org; Sun, 05 Jun 2016 09:21:39 -0400 Date: Sun, 5 Jun 2016 16:21:36 +0300 From: "Michael S. Tsirkin" Message-ID: <1465132825-14242-15-git-send-email-mst@redhat.com> References: <1465132825-14242-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1465132825-14242-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 14/25] 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: Peter Maydell , Corey Minyard , Paolo Bonzini , Richard Henderson , Eduardo Habkost 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 Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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 e29ccc8..92125a8 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -765,8 +765,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, @@ -1182,6 +1180,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) -- MST