pc: Postpone SMBIOS table installation to post machine init
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 <cminyard@mvista.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
15139b8ef0
commit
6d42eefad8
|
@ -765,8 +765,6 @@ static FWCfgState *bochs_bios_init(AddressSpace *as, PCMachineState *pcms)
|
||||||
acpi_tables, acpi_tables_len);
|
acpi_tables, acpi_tables_len);
|
||||||
fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, kvm_allows_irq0_override());
|
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,
|
fw_cfg_add_bytes(fw_cfg, FW_CFG_E820_TABLE,
|
||||||
&e820_reserve, sizeof(e820_reserve));
|
&e820_reserve, sizeof(e820_reserve));
|
||||||
fw_cfg_add_file(fw_cfg, "etc/e820", e820_table,
|
fw_cfg_add_file(fw_cfg, "etc/e820", e820_table,
|
||||||
|
@ -1182,6 +1180,9 @@ void pc_machine_done(Notifier *notifier, void *data)
|
||||||
}
|
}
|
||||||
|
|
||||||
acpi_setup();
|
acpi_setup();
|
||||||
|
if (pcms->fw_cfg) {
|
||||||
|
pc_build_smbios(pcms->fw_cfg);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void pc_guest_info_init(PCMachineState *pcms)
|
void pc_guest_info_init(PCMachineState *pcms)
|
||||||
|
|
Loading…
Reference in a new issue