[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 13/17] pc: Postpone SMBIOS table installation to
From: |
minyard |
Subject: |
[Qemu-devel] [PATCH v4 13/17] pc: Postpone SMBIOS table installation to post machine init |
Date: |
Thu, 12 Nov 2015 13:02:29 -0600 |
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>
---
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
- [Qemu-devel] [PATCH v4 00/17] Add an IPMI device to QEMU, minyard, 2015/11/12
- [Qemu-devel] [PATCH v4 10/17] ipmi: Add a firmware configuration repository, minyard, 2015/11/12
- [Qemu-devel] [PATCH v4 11/17] ipmi: Add firmware registration to the ISA interface, minyard, 2015/11/12
- [Qemu-devel] [PATCH v4 08/17] ipmi: Add documentation, minyard, 2015/11/12
- [Qemu-devel] [PATCH v4 07/17] ipmi: Add tests, minyard, 2015/11/12
- [Qemu-devel] [PATCH v4 05/17] ipmi: Add an ISA KCS low-level interface, minyard, 2015/11/12
- [Qemu-devel] [PATCH v4 04/17] ipmi: Add an external connection simulation interface, minyard, 2015/11/12
- [Qemu-devel] [PATCH v4 02/17] Add a base IPMI interface, minyard, 2015/11/12
- [Qemu-devel] [PATCH v4 13/17] pc: Postpone SMBIOS table installation to post machine init,
minyard <=
- [Qemu-devel] [PATCH v4 09/17] ipmi: Add migration capability to the IPMI devices., minyard, 2015/11/12
- [Qemu-devel] [PATCH v4 12/17] smbios: Move table build tools into an include file., minyard, 2015/11/12
- [Qemu-devel] [PATCH v4 14/17] ipmi: Add SMBIOS table entry, minyard, 2015/11/12
- [Qemu-devel] [PATCH v4 06/17] ipmi: Add a BT low-level interface, minyard, 2015/11/12
- [Qemu-devel] [PATCH v4 03/17] ipmi: Add a local BMC simulation, minyard, 2015/11/12
- [Qemu-devel] [PATCH v4 17/17] ipmi: Add a force off function, minyard, 2015/11/12