From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37738) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTbdy-00052G-S1 for qemu-devel@nongnu.org; Tue, 08 Oct 2013 14:04:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTbds-0007Sv-24 for qemu-devel@nongnu.org; Tue, 08 Oct 2013 14:04:26 -0400 Received: from cantor2.suse.de ([195.135.220.15]:42989 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTbdr-0007SO-PJ for qemu-devel@nongnu.org; Tue, 08 Oct 2013 14:04:19 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 8 Oct 2013 19:44:18 +0200 Message-Id: <1381254296-3203-21-git-send-email-afaerber@suse.de> In-Reply-To: <1381254296-3203-1-git-send-email-afaerber@suse.de> References: <1381254296-3203-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 20/58] milkymist-uart: Use Device::realize instead of SysBusDevice::init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Antony Pavlov , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Antony Pavlov Use of SysBusDevice::init is deprecated. Use Device::realize instead. Also introduce TypeInfo::instance_init milkymist_uart_init(). Reported-by: Peter Crosthwaite Signed-off-by: Antony Pavlov Signed-off-by: Andreas F=C3=A4rber --- hw/char/milkymist-uart.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c index 2e4b5c5..2c52a0f 100644 --- a/hw/char/milkymist-uart.c +++ b/hw/char/milkymist-uart.c @@ -195,22 +195,26 @@ static void milkymist_uart_reset(DeviceState *d) s->regs[R_STAT] =3D STAT_THRE; } =20 -static int milkymist_uart_init(SysBusDevice *dev) +static void milkymist_uart_realize(DeviceState *dev, Error **errp) { MilkymistUartState *s =3D MILKYMIST_UART(dev); =20 - sysbus_init_irq(dev, &s->irq); - - memory_region_init_io(&s->regs_region, OBJECT(s), &uart_mmio_ops, s, - "milkymist-uart", R_MAX * 4); - sysbus_init_mmio(dev, &s->regs_region); - s->chr =3D qemu_char_get_next_serial(); if (s->chr) { qemu_chr_add_handlers(s->chr, uart_can_rx, uart_rx, uart_event, = s); } +} =20 - return 0; +static void milkymist_uart_init(Object *obj) +{ + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + MilkymistUartState *s =3D MILKYMIST_UART(obj); + + sysbus_init_irq(sbd, &s->irq); + + memory_region_init_io(&s->regs_region, OBJECT(s), &uart_mmio_ops, s, + "milkymist-uart", R_MAX * 4); + sysbus_init_mmio(sbd, &s->regs_region); } =20 static const VMStateDescription vmstate_milkymist_uart =3D { @@ -227,9 +231,8 @@ static const VMStateDescription vmstate_milkymist_uar= t =3D { static void milkymist_uart_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D milkymist_uart_init; + dc->realize =3D milkymist_uart_realize; dc->reset =3D milkymist_uart_reset; dc->vmsd =3D &vmstate_milkymist_uart; } @@ -238,6 +241,7 @@ static const TypeInfo milkymist_uart_info =3D { .name =3D TYPE_MILKYMIST_UART, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MilkymistUartState), + .instance_init =3D milkymist_uart_init, .class_init =3D milkymist_uart_class_init, }; =20 --=20 1.8.1.4