From patchwork Wed Feb 24 18:59:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 8411321 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5936CC0553 for ; Wed, 24 Feb 2016 19:00:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B6FA3202E9 for ; Wed, 24 Feb 2016 19:00:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CBC4D20279 for ; Wed, 24 Feb 2016 19:00:17 +0000 (UTC) Received: from localhost ([::1]:37763 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYefZ-0003h9-Ba for patchwork-qemu-devel@patchwork.kernel.org; Wed, 24 Feb 2016 14:00:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36414) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYefR-0003fU-R4 for qemu-devel@nongnu.org; Wed, 24 Feb 2016 14:00:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYefO-0002QR-GA for qemu-devel@nongnu.org; Wed, 24 Feb 2016 14:00:09 -0500 Received: from vms173017pub.verizon.net ([206.46.173.17]:60694) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYefO-0002Mm-C6 for qemu-devel@nongnu.org; Wed, 24 Feb 2016 14:00:06 -0500 Received: from vz-proxy-l008.mx.aol.com ([64.236.82.152]) by vms173017.mailsrvcs.net (Oracle Communications Messaging Server 7.0.5.32.0 64bit (built Jul 16 2014)) with ESMTPA id <0O32008BBFEXWMB0@vms173017.mailsrvcs.net> for qemu-devel@nongnu.org; Wed, 24 Feb 2016 12:59:26 -0600 (CST) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=EdU1O6SC c=1 sm=1 tr=0 a=a3t/a0oOYlYu/nGe1mf8ZA==:117 a=xqWC_Br6kY4A:10 a=jFJIQSaiL_oA:10 a=fk1lIlRQAAAA:8 a=bb2d_ReWGU43yqYY-OMA:9 Received: by 173.57.176.17 with SMTP id 2e20797e; Wed, 24 Feb 2016 18:59:26 GMT Received: from t430.minyard.net (unknown [IPv6:2001:470:b8f6:1b:88cc:7bcf:2247:8571]) by serve.minyard.net (Postfix) with ESMTPA id 732232969; Wed, 24 Feb 2016 12:59:20 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id C046730072B; Wed, 24 Feb 2016 12:59:18 -0600 (CST) From: minyard@acm.org To: Igor Mammedov , "Michael S. Tsirkin" , Paolo Bonzini , qemu-devel@nongnu.org Date: Wed, 24 Feb 2016 12:59:13 -0600 Message-id: <1456340356-17147-3-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.5.0 In-reply-to: <1456340356-17147-1-git-send-email-minyard@acm.org> References: <1456340356-17147-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.46.173.17 Cc: Corey Minyard , minyard@acm.org Subject: [Qemu-devel] [PATCH 2/5] pc: Postpone SMBIOS table installation to post machine init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 0aeefd2..da8fc76 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -778,8 +778,6 @@ static FWCfgState *bochs_bios_init(AddressSpace *as) 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, @@ -1161,6 +1159,7 @@ void pc_machine_done(Notifier *notifier, void *data) { PCMachineState *pcms = container_of(notifier, PCMachineState, machine_done); + FWCfgState *fw_cfg = pcms->fw_cfg; PCIBus *bus = pcms->bus; if (bus) { @@ -1172,15 +1171,17 @@ void pc_machine_done(Notifier *notifier, void *data) extra_hosts++; } } - if (extra_hosts && pcms->fw_cfg) { + if (extra_hosts && fw_cfg) { uint64_t *val = g_malloc(sizeof(*val)); *val = cpu_to_le64(extra_hosts); - fw_cfg_add_file(pcms->fw_cfg, - "etc/extra-pci-roots", val, sizeof(*val)); + fw_cfg_add_file(fw_cfg, "etc/extra-pci-roots", val, sizeof(*val)); } } acpi_setup(); + if (fw_cfg) { + pc_build_smbios(fw_cfg); + } } void pc_guest_info_init(PCMachineState *pcms)