From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwx91-0001Wi-Dq for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zwx90-00053i-GK for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:51 -0500 Received: from mail-pa0-x22e.google.com ([2607:f8b0:400e:c03::22e]:34088) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwx90-00053b-BE for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:50 -0500 Received: by padhx2 with SMTP id hx2so73149211pad.1 for ; Thu, 12 Nov 2015 11:02:49 -0800 (PST) Sender: Corey Minyard From: minyard@acm.org Date: Thu, 12 Nov 2015 13:02:29 -0600 Message-Id: <1447354953-18893-14-git-send-email-minyard@acm.org> In-Reply-To: <1447354953-18893-1-git-send-email-minyard@acm.org> References: <1447354953-18893-1-git-send-email-minyard@acm.org> Subject: [Qemu-devel] [PATCH v4 13/17] 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, Paolo Bonzini , "Michael S. Tsirkin" , Igor Mammedov 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 0cb8afd..47faef7 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -781,8 +781,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, @@ -1174,6 +1172,7 @@ void pc_guest_info_machine_done(Notifier *notifier, void *data) PcGuestInfoState *guest_info_state = container_of(notifier, PcGuestInfoState, machine_done); + FWCfgState *fw_cfg = guest_info_state->info.fw_cfg; PCIBus *bus = find_i440fx(); if (bus) { @@ -1185,15 +1184,17 @@ void pc_guest_info_machine_done(Notifier *notifier, void *data) extra_hosts++; } } - if (extra_hosts && guest_info_state->info.fw_cfg) { + if (extra_hosts && fw_cfg) { uint64_t *val = g_malloc(sizeof(*val)); *val = cpu_to_le64(extra_hosts); - fw_cfg_add_file(guest_info_state->info.fw_cfg, - "etc/extra-pci-roots", val, sizeof(*val)); + fw_cfg_add_file(fw_cfg, "etc/extra-pci-roots", val, sizeof(*val)); } } acpi_setup(&guest_info_state->info); + if (fw_cfg) { + pc_build_smbios(fw_cfg); + } } PcGuestInfo *pc_guest_info_init(PCMachineState *pcms) -- 1.8.3.1