From patchwork Wed May 18 07:29:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 68014 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2487663qge; Wed, 18 May 2016 00:31:38 -0700 (PDT) X-Received: by 10.140.104.84 with SMTP id z78mr5792811qge.65.1463556698571; Wed, 18 May 2016 00:31:38 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z34si5621265qgz.49.2016.05.18.00.31.38 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 18 May 2016 00:31:38 -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]:43392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2vxC-0001eu-4N for patch@linaro.org; Wed, 18 May 2016 03:31:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2vvJ-0000ja-KA for qemu-devel@nongnu.org; Wed, 18 May 2016 03:29:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2vvC-0007Dm-Kb for qemu-devel@nongnu.org; Wed, 18 May 2016 03:29:40 -0400 Received: from mail-oi0-x244.google.com ([2607:f8b0:4003:c06::244]:34283) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2vvC-0007Dh-Ff for qemu-devel@nongnu.org; Wed, 18 May 2016 03:29:34 -0400 Received: by mail-oi0-x244.google.com with SMTP id d139so8042355oig.1 for ; Wed, 18 May 2016 00:29:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=frcDSYIVB3YKEOmRVCH8ew2TTpaxXHX3r5VRaJNqBY8=; b=irfef9Q6AQMDD5mR/ZjoC8KKRenYOl6vVAL/kDYGta9GzHONzsL18lJNzUsZU4sJZU HaFnbj6gr6Bud5MhN0T2ZpwMbOHqh1dv5yZOrkUF03YTezmwleWp9M3MWZgj0P9q3s0w nvhnVOsB8ZYK/xUoiFlrnkO5+ru/IishJJQhl9jhZ8+IdY9Yrl4x5tCbIHhdlWnjZ1R7 VgxDL2a6TXNTWMESZLIQ3l3gDeT79u3Eo44UF3/b7a9wK0cxv4sF+otPrfZcMg8Ut/qo TeJlwXtN8PQrc3eNhwJSHQsknN96guYC/cpEWKp4z/vc075Ggc/XtnO0p9vsqauNPHBh IiWQ== 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:subject:date:message-id :in-reply-to:references; bh=frcDSYIVB3YKEOmRVCH8ew2TTpaxXHX3r5VRaJNqBY8=; b=BUou8ituZZZNloz2CcaFKFRDdjRIonGQ7+vtOck8p4LF+9Z1zWvPryoQBp7+1tCKDG fUL75wbHJQUQ1/udEQO5sBgT0FGitK38EFnewdpAR0xm/sFRuZlgNWDvYDwUKLZtkX8e Hpu83EfWFe1iYz7QmnwETvkARSdJcHU1ZryZ++r4gTjWISk9RXeRtLw10qKAxKsWB/9e 73DKMGbGelV3yn7Vny/BLP3BM/55yOyJJsFa/Iu7U+h2doxnTdyEkCV6VzRgtUZVtNPx RdXLseLGe5eQb1pyb1yOvYWyjX6jzNY4bbmV5vnk7Q4oTVpTw2u5V65ZvtHrhoEOYxu0 xccA== X-Gm-Message-State: AOPr4FX4mz9N6r8VTERtg5dWP+YiXxdog2JuwFA0/aOhDsnbOunuSZnC2gh1u83UeIQXzA== X-Received: by 10.202.225.66 with SMTP id y63mr3453685oig.193.1463556574121; Wed, 18 May 2016 00:29:34 -0700 (PDT) Received: from serve.minyard.net ([108.19.215.157]) by smtp.gmail.com with ESMTPSA id k9sm2008778obw.26.2016.05.18.00.29.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 May 2016 00:29:32 -0700 (PDT) Received: from t430.minyard.net (unknown [IPv6:2001:470:b8f6:1b:118:a7b5:8fb4:e42a]) by serve.minyard.net (Postfix) with ESMTPA id E59961993; Wed, 18 May 2016 02:29:29 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id CEDEF300551; Wed, 18 May 2016 02:29:27 -0500 (CDT) From: minyard@acm.org To: Igor Mammedov , "Michael S . Tsirkin" , Paolo Bonzini , qemu-devel@nongnu.org, minyard@acm.org, cminyard@mvista.com Date: Wed, 18 May 2016 02:29:21 -0500 Message-Id: <1463556565-3947-3-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1463556565-3947-1-git-send-email-minyard@acm.org> References: <1463556565-3947-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:4003:c06::244 Subject: [Qemu-devel] [PATCH v4 2/6] 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: , 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)