[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/12] hw/pci-host/bonito: Use DeviceState::reali
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v2 06/12] hw/pci-host/bonito: Use DeviceState::realize rather than SysBusDevice::init |
Date: |
Tue, 2 Oct 2018 23:25:15 +0200 |
Move from the legacy SysBusDevice::init method to using DeviceState::realize.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/pci-host/bonito.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 9868e2eccc..9f33582706 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -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);
@@ -603,8 +603,6 @@ static int bonito_pcihost_initfn(SysBusDevice *dev)
pci_bonito_set_irq, pci_bonito_map_irq,
dev, get_system_memory(), get_system_io(),
0x28, 32, TYPE_PCI_BUS);
-
- return 0;
}
static void bonito_realize(PCIDevice *dev, Error **errp)
@@ -684,7 +682,6 @@ PCIBus *bonito_init(qemu_irq *pic)
pcihost->pic = pic;
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);
s = PCI_BONITO(d);
s->pcihost = pcihost;
@@ -726,9 +723,9 @@ static const TypeInfo bonito_info = {
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 = {
--
2.19.0
- [Qemu-devel] [PATCH v2 00/12] another SysBusDevice::init to Device::realize cleanup, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 01/12] trace-events: Fix copy/paste typo, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 03/12] hw/timer/sun4v-rtc: Use DeviceState::realize rather than SysBusDevice::init, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 04/12] hw/ssi/xilinx_spi: Use DeviceState::realize rather than SysBusDevice::init, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 02/12] hw/timer/sun4v-rtc: Convert from DPRINTF() macro to trace events, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 06/12] hw/pci-host/bonito: Use DeviceState::realize rather than SysBusDevice::init,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v2 05/12] hw/sh4/sh_pci: Use DeviceState::realize rather than SysBusDevice::init, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 07/12] hw/mips/gt64xxx_pci: Convert gt64120_reset() function into Device reset method, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 08/12] hw/mips/gt64xxx_pci: Mark as bridge device, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 11/12] hw/hppa/dino: Remove unuseful code, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 12/12] hw/mips/malta: Remove unuseful code, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 09/12] hw/sparc64/niagara: Model the I/O Bridge with the 'unimplemented_device', Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 10/12] hw/alpha/typhoon: Remove unuseful code, Philippe Mathieu-Daudé, 2018/10/02
- Re: [Qemu-devel] [PATCH v2 00/12] another SysBusDevice::init to Device::realize cleanup, Philippe Mathieu-Daudé, 2018/10/09