From patchwork Thu Apr 7 14:12:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 607402 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3qgl2H6ZHxz9t4h for ; Fri, 8 Apr 2016 00:13:59 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=jN3ItgN7; dkim-atps=neutral Received: from localhost ([::1]:50089 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoAh3-0003iw-HH for incoming@patchwork.ozlabs.org; Thu, 07 Apr 2016 10:13:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53044) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoAgS-0002fX-AJ for qemu-devel@nongnu.org; Thu, 07 Apr 2016 10:13:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aoAgM-0006ba-Li for qemu-devel@nongnu.org; Thu, 07 Apr 2016 10:13:19 -0400 Received: from mail-pa0-x241.google.com ([2607:f8b0:400e:c03::241]:36289) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoAgM-0006bQ-Em for qemu-devel@nongnu.org; Thu, 07 Apr 2016 10:13:14 -0400 Received: by mail-pa0-x241.google.com with SMTP id k3so3223112pav.3 for ; Thu, 07 Apr 2016 07:13:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=u/hU/hzoL8er36ss3wyi1sSpVqtynZPwHCLVIncg+58=; b=jN3ItgN7Rmbtlr2nqVe/BMY9niJR6+3CW/5rI3Fg7y8PutVywvX+fQ1EO9x4G1LF4f 82k3f2oJsdzQAduufwhJl0BLDMAX56x/JUo2Wyg7dNdx6r6ZyactbsyFm5fYc3f1/poE km0g+7DV4RArIZNUETRStZ7vDHbJMKYsG6oQDyxTLtw151MTkKpcRcMhR0pYNuXHx3i3 MT9HrAOoV3DPL0BvuJp37XLscuVvnnmN+sQzsLZ04AIAHLAyvHx0LwDFeunGXZD/yiMl DkdPsoM6V7GJ2dAohjORF0I+aAEYd9sJ5DL2nYgv+t23L//bLdwqW5RPQ3cyuAe/DB+U TVYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=u/hU/hzoL8er36ss3wyi1sSpVqtynZPwHCLVIncg+58=; b=QYqy+TNdWCalwBIztlgZhPMT9EZ13WEahENk0zGjuB8e21B7evL090563/PD0yCWU7 tHTS4ELvjTDM5DrVP0NkM/4JhDlnlv1G1KcvMbhQcuTzdt6m790gOaz/gVRHUhCsJQJg MfvuaN2oOa2W56ZCJZgonMxfr1JiJOQ/KeMsDJFSX9h0i5NHR/IQf3+ewmZ/bUVdczGk keu3AeCNm0hs8+7WmHWCP/NiY9BSc1ApMZYc+5AYd/2jzVmwQfKE4vfYjbNXIcgCRHA/ PWZfkKVWtWk1g3JQNnYDwDsMm0TsSD7QOO5qV4s0lENOas0xOQPcuj5qNiE5v+DGfIZy 2M/w== X-Gm-Message-State: AD7BkJKhsiytqPJvQlapxm0ESxMD+dDfJI5CzkWU9c1dH71fpF3trJZCTR9BpQe3kDyBJw== X-Received: by 10.67.6.10 with SMTP id cq10mr5013754pad.120.1460038393893; Thu, 07 Apr 2016 07:13:13 -0700 (PDT) Received: from serve.minyard.net ([173.57.176.17]) by smtp.gmail.com with ESMTPSA id l81sm12656391pfj.21.2016.04.07.07.13.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Apr 2016 07:13:11 -0700 (PDT) Received: from t430.minyard.net (unknown [IPv6:2001:470:b8f6:1b:bdea:e997:eaba:4039]) by serve.minyard.net (Postfix) with ESMTPA id 86CA81E1E; Thu, 7 Apr 2016 09:13:10 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id 38DE6300036; Thu, 7 Apr 2016 09:13:07 -0500 (CDT) From: minyard@acm.org To: "Michael S. Tsirkin" , Gerd Hoffmann , Paolo Bonzini , qemu-devel@nongnu.org Date: Thu, 7 Apr 2016 09:12:59 -0500 Message-Id: <1460038383-5318-3-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1460038383-5318-1-git-send-email-minyard@acm.org> References: <1460038383-5318-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c03::241 Cc: Corey Minyard Subject: [Qemu-devel] [PATCH v6 2/6] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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)