[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/20] hw/i386/pc: Use address_space_memory in place
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH 08/20] hw/i386/pc: Use address_space_memory in place |
Date: |
Fri, 24 May 2019 08:35:41 +0200 |
The address_space_memory variable is used once.
Use it in place and remove the argument.
Suggested-by: Samuel Ortiz <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/i386/pc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index fc22779ac1..a3936bb29d 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -928,7 +928,7 @@ static void pc_build_smbios(PCMachineState *pcms)
}
}
-static FWCfgState *bochs_bios_init(AddressSpace *as, PCMachineState *pcms)
+static FWCfgState *bochs_bios_init(PCMachineState *pcms)
{
FWCfgState *fw_cfg;
uint64_t *numa_fw_cfg;
@@ -936,7 +936,8 @@ static FWCfgState *bochs_bios_init(AddressSpace *as,
PCMachineState *pcms)
const CPUArchIdList *cpus;
MachineClass *mc = MACHINE_GET_CLASS(pcms);
- fw_cfg = fw_cfg_init_io_dma(FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4, as);
+ fw_cfg = fw_cfg_init_io_dma(FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4,
+ &address_space_memory);
fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, pcms->boot_cpus);
/* FW_CFG_MAX_CPUS is a bit confusing/problematic on x86:
@@ -1761,7 +1762,7 @@ void pc_memory_init(PCMachineState *pcms,
option_rom_mr,
1);
- fw_cfg = bochs_bios_init(&address_space_memory, pcms);
+ fw_cfg = bochs_bios_init(pcms);
rom_set_fw(fw_cfg);
--
2.20.1
- Re: [Qemu-devel] [PATCH 01/20] hw/i386/pc: Use unsigned type to index arrays, (continued)
- [Qemu-devel] [PATCH 03/20] hw/i386/pc: Let e820_add_entry() return a ssize_t type, Philippe Mathieu-Daudé, 2019/05/24
- [Qemu-devel] [PATCH 04/20] hw/i386/pc: Add the E820Type enum type, Philippe Mathieu-Daudé, 2019/05/24
- [Qemu-devel] [PATCH 05/20] hw/i386/pc: Add documentation to the e820_*() functions, Philippe Mathieu-Daudé, 2019/05/24
- [Qemu-devel] [PATCH 06/20] hw/i386/pc: Use e820_get_num_entries() to access e820_entries, Philippe Mathieu-Daudé, 2019/05/24
- [Qemu-devel] [PATCH 07/20] hw/i386/pc: Extract e820 memory layout code, Philippe Mathieu-Daudé, 2019/05/24
- [Qemu-devel] [PATCH 08/20] hw/i386/pc: Use address_space_memory in place,
Philippe Mathieu-Daudé <=
- [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é, 2019/05/24