From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0XAC-0004mk-UZ for qemu-devel@nongnu.org; Wed, 11 May 2016 12:39:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b0XA5-0002Aw-PE for qemu-devel@nongnu.org; Wed, 11 May 2016 12:39:07 -0400 Received: from mail-pa0-x243.google.com ([2607:f8b0:400e:c03::243]:32838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0XA5-0002Am-Jr for qemu-devel@nongnu.org; Wed, 11 May 2016 12:39:01 -0400 Received: by mail-pa0-x243.google.com with SMTP id gh9so3952379pac.0 for ; Wed, 11 May 2016 09:39:01 -0700 (PDT) Sender: Corey Minyard From: minyard@acm.org Date: Wed, 11 May 2016 11:38:50 -0500 Message-Id: <1462984734-23803-2-git-send-email-minyard@acm.org> In-Reply-To: <1462984734-23803-1-git-send-email-minyard@acm.org> References: <1462984734-23803-1-git-send-email-minyard@acm.org> Subject: [Qemu-devel] [PATCH v2 1/5] 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 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 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 99437e0..5e78ef4 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, @@ -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) -- 2.7.4