OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/i386/pc: Let pc_build_smbios() take a FWCfgState argument

Browse Source 
Pass the FWCfgState object by argument, this will
allow us to remove the PCMachineState argument later.

Suggested-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190818225414.22590-10-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2019-08-19 00:54:08 +02:00 committed by Paolo Bonzini
parent bd802bd981
commit 14fe280757
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/i386/pc.c
View File

@ -894,7 +894,7 @@ static uint32_t x86_cpu_apic_id_from_index(PCMachineState *pcms,
} }
} }
static void pc_build_smbios(PCMachineState *pcms) static void pc_build_smbios(PCMachineState *pcms, FWCfgState *fw_cfg)
{ {
uint8_t *smbios_tables, *smbios_anchor; uint8_t *smbios_tables, *smbios_anchor;
size_t smbios_tables_len, smbios_anchor_len; size_t smbios_tables_len, smbios_anchor_len;
@ -908,7 +908,7 @@ static void pc_build_smbios(PCMachineState *pcms)
smbios_tables = smbios_get_table_legacy(ms, &smbios_tables_len); smbios_tables = smbios_get_table_legacy(ms, &smbios_tables_len);
if (smbios_tables) { if (smbios_tables) {
fw_cfg_add_bytes(pcms->fw_cfg, FW_CFG_SMBIOS_ENTRIES, fw_cfg_add_bytes(fw_cfg, FW_CFG_SMBIOS_ENTRIES,
smbios_tables, smbios_tables_len); smbios_tables, smbios_tables_len);
} }
@ -929,9 +929,9 @@ static void pc_build_smbios(PCMachineState *pcms)
g_free(mem_array); g_free(mem_array);
if (smbios_anchor) { if (smbios_anchor) {
fw_cfg_add_file(pcms->fw_cfg, "etc/smbios/smbios-tables", fw_cfg_add_file(fw_cfg, "etc/smbios/smbios-tables",
smbios_tables, smbios_tables_len); smbios_tables, smbios_tables_len);
fw_cfg_add_file(pcms->fw_cfg, "etc/smbios/smbios-anchor", fw_cfg_add_file(fw_cfg, "etc/smbios/smbios-anchor",
smbios_anchor, smbios_anchor_len); smbios_anchor, smbios_anchor_len);
} }
} }
@ -1695,7 +1695,7 @@ void pc_machine_done(Notifier *notifier, void *data)
acpi_setup(); acpi_setup();
if (pcms->fw_cfg) { if (pcms->fw_cfg) {
pc_build_smbios(pcms); pc_build_smbios(pcms, pcms->fw_cfg);
pc_build_feature_control_file(pcms); pc_build_feature_control_file(pcms);
/* update FW_CFG_NB_CPUS to account for -device added CPUs */ /* update FW_CFG_NB_CPUS to account for -device added CPUs */
fw_cfg_modify_i16(pcms->fw_cfg, FW_CFG_NB_CPUS, pcms->boot_cpus); fw_cfg_modify_i16(pcms->fw_cfg, FW_CFG_NB_CPUS, pcms->boot_cpus);