[libvirt] [PULL 10/45] hw/pci-host/bonito: Use DeviceState::realize rather than SysBusDevice::init
David Gibson
david at gibson.dropbear.id.au
Tue Oct 23 15:14:08 UTC 2018
On Thu, Oct 18, 2018 at 05:03:47PM -0300, Eduardo Habkost wrote:
> From: Philippe Mathieu-Daudé <f4bug at amsat.org>
>
> Move from the legacy SysBusDevice::init method to using DeviceState::realize.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug at amsat.org>
> Message-Id: <20181002212522.23303-7-f4bug at amsat.org>
> Reviewed-by: Peter Maydell <peter.maydell at linaro.org>
> Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
Reviewed-by: David Gibson <david at gibson.dropbear.id.au>
> ---
> 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 = {
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20181023/6b020b27/attachment-0001.sig>
More information about the libvir-list
mailing list