mirror of https://gitlab.com/qemu-project/qemu
40p: don't use legacy fw_cfg_init_mem() function
Instead initialise the device via qdev to allow us to set device properties directly as required. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Acked-by: Hervé Poussineau <hpoussin@reactos.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
93323287bb
commit
0f08085971
|
@ -618,7 +618,7 @@ static void ibm_40p_init(MachineState *machine)
|
||||||
uint16_t cmos_checksum;
|
uint16_t cmos_checksum;
|
||||||
PowerPCCPU *cpu;
|
PowerPCCPU *cpu;
|
||||||
DeviceState *dev;
|
DeviceState *dev;
|
||||||
SysBusDevice *pcihost;
|
SysBusDevice *pcihost, *s;
|
||||||
Nvram *m48t59 = NULL;
|
Nvram *m48t59 = NULL;
|
||||||
PCIBus *pci_bus;
|
PCIBus *pci_bus;
|
||||||
ISABus *isa_bus;
|
ISABus *isa_bus;
|
||||||
|
@ -711,7 +711,16 @@ static void ibm_40p_init(MachineState *machine)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Prepare firmware configuration for OpenBIOS */
|
/* Prepare firmware configuration for OpenBIOS */
|
||||||
fw_cfg = fw_cfg_init_mem(CFG_ADDR, CFG_ADDR + 2);
|
dev = qdev_create(NULL, TYPE_FW_CFG_MEM);
|
||||||
|
fw_cfg = FW_CFG(dev);
|
||||||
|
qdev_prop_set_uint32(dev, "data_width", 1);
|
||||||
|
qdev_prop_set_bit(dev, "dma_enabled", false);
|
||||||
|
object_property_add_child(OBJECT(qdev_get_machine()), TYPE_FW_CFG,
|
||||||
|
OBJECT(fw_cfg), NULL);
|
||||||
|
qdev_init_nofail(dev);
|
||||||
|
s = SYS_BUS_DEVICE(dev);
|
||||||
|
sysbus_mmio_map(s, 0, CFG_ADDR);
|
||||||
|
sysbus_mmio_map(s, 1, CFG_ADDR + 2);
|
||||||
|
|
||||||
if (machine->kernel_filename) {
|
if (machine->kernel_filename) {
|
||||||
/* load kernel */
|
/* load kernel */
|
||||||
|
|
Loading…
Reference in New Issue