mirror of https://github.com/proxmox/mirror_qemu
fw_cfg: move setting of FW_CFG_VERSION_DMA bit to fw_cfg_init1()
The setting of the FW_CFG_VERSION_DMA bit is the same across both the TYPE_FW_CFG_MEM and TYPE_FW_CFG_IO devices, so unify the logic in fw_cfg_init1(). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Tested-by: Gabriel Somlo <somlo@cmu.edu>master
parent
91685323b1
commit
3c1aa733d9
|
@ -913,6 +913,7 @@ static void fw_cfg_init1(DeviceState *dev)
|
||||||
{
|
{
|
||||||
FWCfgState *s = FW_CFG(dev);
|
FWCfgState *s = FW_CFG(dev);
|
||||||
MachineState *machine = MACHINE(qdev_get_machine());
|
MachineState *machine = MACHINE(qdev_get_machine());
|
||||||
|
uint32_t version = FW_CFG_VERSION;
|
||||||
|
|
||||||
assert(!object_resolve_path(FW_CFG_PATH, NULL));
|
assert(!object_resolve_path(FW_CFG_PATH, NULL));
|
||||||
|
|
||||||
|
@ -927,6 +928,12 @@ static void fw_cfg_init1(DeviceState *dev)
|
||||||
fw_cfg_bootsplash(s);
|
fw_cfg_bootsplash(s);
|
||||||
fw_cfg_reboot(s);
|
fw_cfg_reboot(s);
|
||||||
|
|
||||||
|
if (s->dma_enabled) {
|
||||||
|
version |= FW_CFG_VERSION_DMA;
|
||||||
|
}
|
||||||
|
|
||||||
|
fw_cfg_add_i32(s, FW_CFG_ID, version);
|
||||||
|
|
||||||
s->machine_ready.notify = fw_cfg_machine_ready;
|
s->machine_ready.notify = fw_cfg_machine_ready;
|
||||||
qemu_add_machine_init_done_notifier(&s->machine_ready);
|
qemu_add_machine_init_done_notifier(&s->machine_ready);
|
||||||
}
|
}
|
||||||
|
@ -938,7 +945,6 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase,
|
||||||
SysBusDevice *sbd;
|
SysBusDevice *sbd;
|
||||||
FWCfgIoState *ios;
|
FWCfgIoState *ios;
|
||||||
FWCfgState *s;
|
FWCfgState *s;
|
||||||
uint32_t version = FW_CFG_VERSION;
|
|
||||||
bool dma_requested = dma_iobase && dma_as;
|
bool dma_requested = dma_iobase && dma_as;
|
||||||
|
|
||||||
dev = qdev_create(NULL, TYPE_FW_CFG_IO);
|
dev = qdev_create(NULL, TYPE_FW_CFG_IO);
|
||||||
|
@ -959,12 +965,8 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase,
|
||||||
s->dma_as = dma_as;
|
s->dma_as = dma_as;
|
||||||
s->dma_addr = 0;
|
s->dma_addr = 0;
|
||||||
sysbus_add_io(sbd, dma_iobase, &s->dma_iomem);
|
sysbus_add_io(sbd, dma_iobase, &s->dma_iomem);
|
||||||
|
|
||||||
version |= FW_CFG_VERSION_DMA;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fw_cfg_add_i32(s, FW_CFG_ID, version);
|
|
||||||
|
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -980,7 +982,6 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr,
|
||||||
DeviceState *dev;
|
DeviceState *dev;
|
||||||
SysBusDevice *sbd;
|
SysBusDevice *sbd;
|
||||||
FWCfgState *s;
|
FWCfgState *s;
|
||||||
uint32_t version = FW_CFG_VERSION;
|
|
||||||
bool dma_requested = dma_addr && dma_as;
|
bool dma_requested = dma_addr && dma_as;
|
||||||
|
|
||||||
dev = qdev_create(NULL, TYPE_FW_CFG_MEM);
|
dev = qdev_create(NULL, TYPE_FW_CFG_MEM);
|
||||||
|
@ -1001,11 +1002,8 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr,
|
||||||
s->dma_as = dma_as;
|
s->dma_as = dma_as;
|
||||||
s->dma_addr = 0;
|
s->dma_addr = 0;
|
||||||
sysbus_mmio_map(sbd, 2, dma_addr);
|
sysbus_mmio_map(sbd, 2, dma_addr);
|
||||||
version |= FW_CFG_VERSION_DMA;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fw_cfg_add_i32(s, FW_CFG_ID, version);
|
|
||||||
|
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue