From patchwork Wed May 11 16:38:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 67609 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp319590qge; Wed, 11 May 2016 09:39:51 -0700 (PDT) X-Received: by 10.55.79.5 with SMTP id d5mr4744671qkb.30.1462984791312; Wed, 11 May 2016 09:39:51 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c8si5757190qkb.35.2016.05.11.09.39.51 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 11 May 2016 09:39:51 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:53198 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0XAs-0005bn-KL for patch@linaro.org; Wed, 11 May 2016 12:39:50 -0400 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) 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=frcDSYIVB3YKEOmRVCH8ew2TTpaxXHX3r5VRaJNqBY8=; b=LIq6rzrgl8UytjFfWYckaJhTYGf+r8ldsTmagAB8xJcLmp4Z3kAuCT4+UndyhOt7Wq QSDQBgeCkgznSrLtIAxdfZDqkEOWfdbw50O4Mkt2fn7dnRH9vG9RynN8Xs49yb/XRpJl DqPd42KgZu/vPnkaXZ2+uxu28OKVZBJgRN1OCye2V5Jlp9/A7kFQ/tUBlJD4U8/NPRup 7+2/mkkDCbJUoj0ey0krSGRK92mC9aXfD7Vi9QKFYopN+rbWUrqNNe0bBhoAIdqjV2Tv ZgNJ119D/THT1hPBBD6cZ8SPnWtZNvCMmI0lvqSUhlV5O31hdNStHNc8vmT5iE5ifqTa AA0g== 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=frcDSYIVB3YKEOmRVCH8ew2TTpaxXHX3r5VRaJNqBY8=; b=KcYu8FvnbBwe3RVfsCDMsMRWRx/NSuC+o/AGaKj6h+45jQHCPBw16v7+uvYz6YyvER GkHfQ1OG8MSAtDg8laa7lW17GdHWph1scATSnaeA5K9f0MEvPSqxZd/uYPxKmIieriqZ bHWWrgfscra5yY9n18MCi3ViV0vATcVpstnCjWgf8WtfDyPMHL48PqL1YbKIZZLpDy3H 7cxGpcPapRd1JEXmzBszLMgwVJ69RFyWUrkBAsjicOPasMcWzHe5A9hSDp26ZUTMXdZv JkGkQ9Tk+S5m+neYhfCQPF0Yda2ZvypvsECZ8CsNwLNEHoUmM1omewQ0veajxngJ9+Nz csMg== X-Gm-Message-State: AOPr4FUBOn46+KCgDu3ZME2wm1HUxr25WTp/Rx4L6NLBko+V/hC5ulq2yMckCAR7Rnigkg== X-Received: by 10.66.222.202 with SMTP id qo10mr6179087pac.141.1462984740805; Wed, 11 May 2016 09:39:00 -0700 (PDT) Received: from serve.minyard.net ([108.19.215.157]) by smtp.gmail.com with ESMTPSA id 63sm13393103pff.43.2016.05.11.09.38.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 May 2016 09:38:59 -0700 (PDT) Received: from t430.minyard.net (unknown [IPv6:2001:470:b8f6:1b:a430:dab6:589a:a3a1]) by serve.minyard.net (Postfix) with ESMTPA id BF12B1853; Wed, 11 May 2016 11:38:57 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id 4E16D30052B; Wed, 11 May 2016 11:38:56 -0500 (CDT) From: minyard@acm.org To: Igor Mammedov , "Michael S . Tsirkin" , Paolo Bonzini , qemu-devel@nongnu.org, minyard@acm.org Date: Wed, 11 May 2016 11:38:50 -0500 Message-Id: <1462984734-23803-2-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1462984734-23803-1-git-send-email-minyard@acm.org> References: <1462984734-23803-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::243 Subject: [Qemu-devel] [PATCH v2 1/5] pc: Postpone SMBIOS table installation to post machine init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Corey Minyard Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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(-) -- 2.7.4 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)