mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/ssi/xilinx_spi: Use DeviceState::realize rather than SysBusDevice::init

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

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20181002212522.23303-5-f4bug@amsat.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2018-10-02 23:25:13 +02:00 committed by Eduardo Habkost
parent e871972e65
commit a7e1562ca2
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/ssi/xilinx_spi.c
View File

@ -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); XilinxSPI *s = XILINX_SPI(dev);
int i; int i;
@ -344,8 +344,6 @@ static int xilinx_spi_init(SysBusDevice *sbd)
fifo8_create(&s->tx_fifo, FIFO_CAPACITY); fifo8_create(&s->tx_fifo, FIFO_CAPACITY);
fifo8_create(&s->rx_fifo, FIFO_CAPACITY); fifo8_create(&s->rx_fifo, FIFO_CAPACITY);
return 0;
} }
static const VMStateDescription vmstate_xilinx_spi = { 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) static void xilinx_spi_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); 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->reset = xlx_spi_reset;
dc->props = xilinx_spi_properties; dc->props = xilinx_spi_properties;
dc->vmsd = &vmstate_xilinx_spi; dc->vmsd = &vmstate_xilinx_spi;