On Thu, Oct 18, 2018 at 05:03:45PM -0300, Eduardo Habkost wrote: > From: Philippe Mathieu-Daudé <[email protected]> > > Move from the legacy SysBusDevice::init method to using DeviceState::realize. > > Signed-off-by: Philippe Mathieu-Daudé <[email protected]> > Reviewed-by: Thomas Huth <[email protected]> > Reviewed-by: Cédric Le Goater <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Eduardo Habkost <[email protected]>
Reviewed-by: David Gibson <[email protected]> > --- > hw/ssi/xilinx_spi.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c > index 83585bc8b2..3dae303d5b 100644 > --- a/hw/ssi/xilinx_spi.c > +++ b/hw/ssi/xilinx_spi.c > @@ -319,9 +319,9 @@ static const MemoryRegionOps spi_ops = { > } > }; > > -static int xilinx_spi_init(SysBusDevice *sbd) > +static void xilinx_spi_realize(DeviceState *dev, Error **errp) > { > - DeviceState *dev = DEVICE(sbd); > + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); > XilinxSPI *s = XILINX_SPI(dev); > int i; > > @@ -344,8 +344,6 @@ static int xilinx_spi_init(SysBusDevice *sbd) > > fifo8_create(&s->tx_fifo, FIFO_CAPACITY); > fifo8_create(&s->rx_fifo, FIFO_CAPACITY); > - > - return 0; > } > > static const VMStateDescription vmstate_xilinx_spi = { > @@ -368,9 +366,8 @@ static Property xilinx_spi_properties[] = { > static void xilinx_spi_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); > > - k->init = xilinx_spi_init; > + dc->realize = xilinx_spi_realize; > dc->reset = xlx_spi_reset; > dc->props = xilinx_spi_properties; > dc->vmsd = &vmstate_xilinx_spi; -- 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
signature.asc
Description: PGP signature
-- libvir-list mailing list [email protected] https://www.redhat.com/mailman/listinfo/libvir-list
