[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH 2/5] pc: Postpone SMBIOS table installation to p

From: Corey Minyard
Subject: Re: [Qemu-devel] [PATCH 2/5] pc: Postpone SMBIOS table installation to post machine init
Date: Mon, 14 Mar 2016 20:30:59 +0700
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0

On 03/13/2016 09:03 PM, Michael S. Tsirkin wrote:
On Wed, Feb 24, 2016 at 12:59:13PM -0600, address@hidden wrote:
From: Corey Minyard <address@hidden>

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 <address@hidden>
This changes the order of fw cfg files, which
is guest visible.
Need to make it depend on either machine type

Do you mean add a new machine type, like adding a
2.7 version of pc-i440fx and pc-q35?

or the presence of ipmi somehow.

You could pre-scan for ipmi options from early in the
pc code.  Kind of hackish.

One other option would be to just have ACPI support for
IPMI.  Older OSes might not work; I'm not sure how
important that is.

Does anyone have a preference here?  To me, adding a
new machine type looks easiest, but I'm not sure of the
effects on users.


  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 0aeefd2..da8fc76 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -778,8 +778,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,
@@ -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)
-        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));
+    if (fw_cfg) {
+        pc_build_smbios(fw_cfg);
+    }
void pc_guest_info_init(PCMachineState *pcms)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]