david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/i386/pc: Use address_space_memory in place

Browse Source 
The address_space_memory variable is used once.
Use it in place and remove the argument.

Suggested-by: Samuel Ortiz <sameo@linux.intel.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190818225414.22590-4-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2019-08-19 00:54:02 +02:00 committed by Paolo Bonzini
parent d6d059ca07
commit 0f432b3064
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/i386/pc.c
View File

@ -936,7 +936,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; FWCfgState *fw_cfg;
uint64_t *numa_fw_cfg; uint64_t *numa_fw_cfg;
@ -946,7 +946,8 @@ static FWCfgState *bochs_bios_init(AddressSpace *as, PCMachineState *pcms)
MachineState *ms = MACHINE(pcms); MachineState *ms = MACHINE(pcms);
int nb_numa_nodes = ms->numa_state->num_nodes; int nb_numa_nodes = ms->numa_state->num_nodes;
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_add_i16(fw_cfg, FW_CFG_NB_CPUS, pcms->boot_cpus);
/* FW_CFG_MAX_CPUS is a bit confusing/problematic on x86: /* FW_CFG_MAX_CPUS is a bit confusing/problematic on x86:
@ -1868,7 +1869,7 @@ void pc_memory_init(PCMachineState *pcms,
option_rom_mr, option_rom_mr,
1); 1);
fw_cfg = bochs_bios_init(&address_space_memory, pcms); fw_cfg = bochs_bios_init(pcms);
rom_set_fw(fw_cfg); rom_set_fw(fw_cfg);