| Message ID | 1443701819-13855-6-git-send-email-markmb@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 10/01/15 14:16, Marc Marí wrote: > Enable the fw_cfg DMA interface for all the x86 platforms. > > Based on Gerd Hoffman's initial implementation. > > Signed-off-by: Marc Marí <markmb@redhat.com> > --- > hw/i386/pc.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 461c128..81d93b4 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -753,14 +753,15 @@ static void pc_build_smbios(FWCfgState *fw_cfg) > } > } > > -static FWCfgState *bochs_bios_init(void) > +static FWCfgState *bochs_bios_init(AddressSpace *as) > { > FWCfgState *fw_cfg; > uint64_t *numa_fw_cfg; > int i, j; > unsigned int apic_id_limit = pc_apic_id_limit(max_cpus); > > - fw_cfg = fw_cfg_init_io(BIOS_CFG_IOPORT); > + fw_cfg = fw_cfg_init_io_dma(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 4, as); > + > /* FW_CFG_MAX_CPUS is a bit confusing/problematic on x86: > * > * SeaBIOS needs FW_CFG_MAX_CPUS for CPU hotplug, but the CPU hotplug > @@ -1407,7 +1408,8 @@ FWCfgState *pc_memory_init(PCMachineState *pcms, > option_rom_mr, > 1); > > - fw_cfg = bochs_bios_init(); > + fw_cfg = bochs_bios_init(&address_space_memory); > + > rom_set_fw(fw_cfg); > > if (guest_info->has_reserved_memory && pcms->hotplug_memory.base) { > Looks like this matches the agreement between Gerd and Peter. http://thread.gmane.org/gmane.comp.emulators.qemu/363030/focus=363058 Reviewed-by: Laszlo Ersek <lersek@redhat.com>
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 461c128..81d93b4 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -753,14 +753,15 @@ static void pc_build_smbios(FWCfgState *fw_cfg) } } -static FWCfgState *bochs_bios_init(void) +static FWCfgState *bochs_bios_init(AddressSpace *as) { FWCfgState *fw_cfg; uint64_t *numa_fw_cfg; int i, j; unsigned int apic_id_limit = pc_apic_id_limit(max_cpus); - fw_cfg = fw_cfg_init_io(BIOS_CFG_IOPORT); + fw_cfg = fw_cfg_init_io_dma(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 4, as); + /* FW_CFG_MAX_CPUS is a bit confusing/problematic on x86: * * SeaBIOS needs FW_CFG_MAX_CPUS for CPU hotplug, but the CPU hotplug @@ -1407,7 +1408,8 @@ FWCfgState *pc_memory_init(PCMachineState *pcms, option_rom_mr, 1); - fw_cfg = bochs_bios_init(); + fw_cfg = bochs_bios_init(&address_space_memory); + rom_set_fw(fw_cfg); if (guest_info->has_reserved_memory && pcms->hotplug_memory.base) {
Enable the fw_cfg DMA interface for all the x86 platforms. Based on Gerd Hoffman's initial implementation. Signed-off-by: Marc Marí <markmb@redhat.com> --- hw/i386/pc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)