diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-08-19 00:54:02 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-09-16 17:13:07 +0200 |
| commit | 0f432b3064a227bfce34bede1ba40eb7f0cb3262 (patch) | |
| tree | 33d1e1fed45b72fafaa056a3991d657706c196fb /hw/i386/pc.c | |
| parent | d6d059ca07ae907b8945f88c382fb54d43f9f03a (diff) | |
| download | focaccia-qemu-0f432b3064a227bfce34bede1ba40eb7f0cb3262.tar.gz focaccia-qemu-0f432b3064a227bfce34bede1ba40eb7f0cb3262.zip | |
hw/i386/pc: Use address_space_memory in place
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>
Diffstat (limited to 'hw/i386/pc.c')
| -rw-r--r-- | hw/i386/pc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 81e5a59d82..dd5ec2e7c7 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -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; uint64_t *numa_fw_cfg; @@ -946,7 +946,8 @@ static FWCfgState *bochs_bios_init(AddressSpace *as, PCMachineState *pcms) MachineState *ms = MACHINE(pcms); 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_MAX_CPUS is a bit confusing/problematic on x86: @@ -1868,7 +1869,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); |