| Message ID | 20181001220942.2382-5-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | another SysBusDevice::init to Device::realize cleanup | expand |
On 2018-10-02 00:09, Philippe Mathieu-Daudé wrote: > Move from the legacy SysBusDevice::init method to using DeviceState::realize. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > 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; > Reviewed-by: Thomas Huth <thuth@redhat.com>
On 10/2/18 12:09 AM, Philippe Mathieu-Daudé wrote: > Move from the legacy SysBusDevice::init method to using DeviceState::realize. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > 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; >
On Mon, Oct 1, 2018 at 3:32 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > > Move from the legacy SysBusDevice::init method to using DeviceState::realize. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > 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; > -- > 2.19.0 > >
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;
Move from the legacy SysBusDevice::init method to using DeviceState::realize. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/ssi/xilinx_spi.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)