[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/20] hw/i386/pc: Let pc_build_smbios() take a FWCf
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH 14/20] hw/i386/pc: Let pc_build_smbios() take a FWCfgState argument |
Date: |
Fri, 24 May 2019 08:35:47 +0200 |
Pass the FWCfgState object by argument, this will
allow us to remove the PCMachineState argument later.
Suggested-by: Samuel Ortiz <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/i386/pc.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index e8813ef2b6..b029aee6c7 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -886,7 +886,7 @@ static uint32_t x86_cpu_apic_id_from_index(unsigned int
cpu_index)
}
}
-static void pc_build_smbios(PCMachineState *pcms)
+static void pc_build_smbios(PCMachineState *pcms, FWCfgState *fw_cfg)
{
uint8_t *smbios_tables, *smbios_anchor;
size_t smbios_tables_len, smbios_anchor_len;
@@ -900,7 +900,7 @@ static void pc_build_smbios(PCMachineState *pcms)
smbios_tables = smbios_get_table_legacy(&smbios_tables_len);
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);
}
@@ -921,9 +921,9 @@ static void pc_build_smbios(PCMachineState *pcms)
g_free(mem_array);
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);
- 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);
}
}
@@ -1587,7 +1587,7 @@ void pc_machine_done(Notifier *notifier, void *data)
acpi_setup();
if (pcms->fw_cfg) {
- pc_build_smbios(pcms);
+ pc_build_smbios(pcms, pcms->fw_cfg);
pc_build_feature_control_file(pcms);
/* 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);
--
2.20.1
- Re: [Qemu-devel] [PATCH 07/20] hw/i386/pc: Extract e820 memory layout code, (continued)
- [Qemu-devel] [PATCH 08/20] hw/i386/pc: Use address_space_memory in place, Philippe Mathieu-Daudé, 2019/05/24
- [Qemu-devel] [PATCH 09/20] hw/i386/pc: Rename bochs_bios_init() more generic as x86_create_fw_cfg(), Philippe Mathieu-Daudé, 2019/05/24
- [Qemu-devel] [PATCH 10/20] hw/i386/pc: Pass the boot_cpus value by argument, Philippe Mathieu-Daudé, 2019/05/24
- [Qemu-devel] [PATCH 11/20] hw/i386/pc: Pass the apic_id_limit value by argument, Philippe Mathieu-Daudé, 2019/05/24
- [Qemu-devel] [PATCH 12/20] hw/i386/pc: Pass the CPUArchIdList array by argument, Philippe Mathieu-Daudé, 2019/05/24
- [Qemu-devel] [PATCH 13/20] hw/i386/pc: Let fw_cfg_init() use the generic MachineState, Philippe Mathieu-Daudé, 2019/05/24
- [Qemu-devel] [PATCH 14/20] hw/i386/pc: Let pc_build_smbios() take a FWCfgState argument,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH 15/20] hw/i386/pc: Let pc_build_smbios() take a generic MachineState argument, Philippe Mathieu-Daudé, 2019/05/24
- [Qemu-devel] [PATCH 16/20] hw/i386/pc: Rename pc_build_smbios() as generic fw_cfg_build_smbios(), Philippe Mathieu-Daudé, 2019/05/24
- [Qemu-devel] [PATCH 17/20] hw/i386/pc: Let pc_build_feature_control() take a FWCfgState argument, Philippe Mathieu-Daudé, 2019/05/24
- [Qemu-devel] [PATCH 18/20] hw/i386/pc: Let pc_build_feature_control() take a MachineState argument, Philippe Mathieu-Daudé, 2019/05/24
- [Qemu-devel] [PATCH 19/20] hw/i386/pc: Rename pc_build_feature_control() as generic fw_cfg_build_*, Philippe Mathieu-Daudé, 2019/05/24
- [Qemu-devel] [PATCH 20/20] hw/i386/pc: Extract the x86 generic fw_cfg code, Philippe Mathieu-Daudé, 2019/05/24
- Re: [Qemu-devel] [PATCH 00/20] hw/i386/pc: Do not restrict the fw_cfg functions to the PC machine, Michael S. Tsirkin, 2019/05/28