ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/pci-host/bonito: Use DeviceState::realize rather than SysBusDevice::init 

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

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20181002212522.23303-7-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:15 +02:00 committed by Eduardo Habkost
parent 0e372e5853
commit e800894a1c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/pci-host/bonito.c
View File

@ -595,7 +595,7 @@ static const VMStateDescription vmstate_bonito = {
} }
}; };
static int bonito_pcihost_initfn(SysBusDevice *dev) static void bonito_pcihost_realize(DeviceState *dev, Error **errp)
{ {
PCIHostState *phb = PCI_HOST_BRIDGE(dev); PCIHostState *phb = PCI_HOST_BRIDGE(dev);
@ -603,8 +603,6 @@ static int bonito_pcihost_initfn(SysBusDevice *dev)
pci_bonito_set_irq, pci_bonito_map_irq, pci_bonito_set_irq, pci_bonito_map_irq,
dev, get_system_memory(), get_system_io(), dev, get_system_memory(), get_system_io(),
0x28, 32, TYPE_PCI_BUS); 0x28, 32, TYPE_PCI_BUS);
return 0;
} }
static void bonito_realize(PCIDevice *dev, Error **errp) static void bonito_realize(PCIDevice *dev, Error **errp)
@ -684,7 +682,6 @@ PCIBus *bonito_init(qemu_irq *pic)
pcihost->pic = pic; pcihost->pic = pic;
qdev_init_nofail(dev); qdev_init_nofail(dev);
/* set the pcihost pointer before bonito_initfn is called */
d = pci_create(phb->bus, PCI_DEVFN(0, 0), TYPE_PCI_BONITO); d = pci_create(phb->bus, PCI_DEVFN(0, 0), TYPE_PCI_BONITO);
s = PCI_BONITO(d); s = PCI_BONITO(d);
s->pcihost = pcihost; s->pcihost = pcihost;
@ -726,9 +723,9 @@ static const TypeInfo bonito_info = {
static void bonito_pcihost_class_init(ObjectClass *klass, void *data) static void bonito_pcihost_class_init(ObjectClass *klass, void *data)
{ {
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
k->init = bonito_pcihost_initfn; dc->realize = bonito_pcihost_realize;
} }
static const TypeInfo bonito_pcihost_info = { static const TypeInfo bonito_pcihost_info = {