mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/sh4/sh_pci: Use DeviceState::realize rather than SysBusDevice::init

Browse Source 
Move from the legacy SysBusDevice::init method to using DeviceState::realize.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20181002212522.23303-6-f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2018-10-02 23:25:14 +02:00 committed by Eduardo Habkost
parent a7e1562ca2
commit 0e372e5853
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/sh4/sh_pci.c
View File

@ -120,16 +120,15 @@ static void sh_pci_set_irq(void *opaque, int irq_num, int level)
qemu_set_irq(pic[irq_num], level); qemu_set_irq(pic[irq_num], level);
} }
static int sh_pci_device_init(SysBusDevice *dev) static void sh_pci_device_realize(DeviceState *dev, Error **errp)
{ {
PCIHostState *phb; SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
SHPCIState *s; SHPCIState *s = SH_PCI_HOST_BRIDGE(dev);
PCIHostState *phb = PCI_HOST_BRIDGE(s);
int i; int i;
s = SH_PCI_HOST_BRIDGE(dev);
phb = PCI_HOST_BRIDGE(s);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
sysbus_init_irq(dev, &s->irq[i]); sysbus_init_irq(sbd, &s->irq[i]);
} }
phb->bus = pci_register_root_bus(DEVICE(dev), "pci", phb->bus = pci_register_root_bus(DEVICE(dev), "pci",
sh_pci_set_irq, sh_pci_map_irq, sh_pci_set_irq, sh_pci_map_irq,
@ -143,13 +142,12 @@ static int sh_pci_device_init(SysBusDevice *dev)
&s->memconfig_p4, 0, 0x224); &s->memconfig_p4, 0, 0x224);
memory_region_init_alias(&s->isa, OBJECT(s), "sh_pci.isa", memory_region_init_alias(&s->isa, OBJECT(s), "sh_pci.isa",
get_system_io(), 0, 0x40000); get_system_io(), 0, 0x40000);
sysbus_init_mmio(dev, &s->memconfig_p4); sysbus_init_mmio(sbd, &s->memconfig_p4);
sysbus_init_mmio(dev, &s->memconfig_a7); sysbus_init_mmio(sbd, &s->memconfig_a7);
s->iobr = 0xfe240000; s->iobr = 0xfe240000;
memory_region_add_subregion(get_system_memory(), s->iobr, &s->isa); memory_region_add_subregion(get_system_memory(), s->iobr, &s->isa);
s->dev = pci_create_simple(phb->bus, PCI_DEVFN(0, 0), "sh_pci_host"); s->dev = pci_create_simple(phb->bus, PCI_DEVFN(0, 0), "sh_pci_host");
return 0;
} }
static void sh_pci_host_realize(PCIDevice *d, Error **errp) static void sh_pci_host_realize(PCIDevice *d, Error **errp)
@ -187,9 +185,9 @@ static const TypeInfo sh_pci_host_info = {
static void sh_pci_device_class_init(ObjectClass *klass, void *data) static void sh_pci_device_class_init(ObjectClass *klass, void *data)
{ {
SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
sdc->init = sh_pci_device_init; dc->realize = sh_pci_device_realize;
} }
static const TypeInfo sh_pci_device_info = { static const TypeInfo sh_pci_device_info = {