From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Pp3-0003dQ-Tv for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:47:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1Pow-0004C5-BL for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:47:21 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45876 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Pov-0004BK-Vv for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:47:14 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 23 Jul 2013 01:46:34 +0200 Message-Id: <1374536796-13983-54-git-send-email-afaerber@suse.de> In-Reply-To: <1374536796-13983-1-git-send-email-afaerber@suse.de> References: <1374536796-13983-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 53/55] kvmvapic: Use QOM realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Hu Tao , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Hu Tao Signed-off-by: Hu Tao [AF: Renamed variable] Signed-off-by: Andreas F=C3=A4rber --- hw/i386/kvmvapic.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index ccd089a..365b219 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -703,19 +703,18 @@ static const MemoryRegionOps vapic_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int vapic_init(SysBusDevice *dev) +static void vapic_realize(DeviceState *dev, Error **errp) { + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); VAPICROMState *s =3D VAPIC(dev); =20 memory_region_init_io(&s->io, OBJECT(s), &vapic_ops, s, "kvmvapic", = 2); - sysbus_add_io(dev, VAPIC_IO_PORT, &s->io); - sysbus_init_ioports(dev, VAPIC_IO_PORT, 2); + sysbus_add_io(sbd, VAPIC_IO_PORT, &s->io); + sysbus_init_ioports(sbd, VAPIC_IO_PORT, 2); =20 option_rom[nb_option_roms].name =3D "kvmvapic.bin"; option_rom[nb_option_roms].bootindex =3D -1; nb_option_roms++; - - return 0; } =20 static void do_vapic_enable(void *data) @@ -812,13 +811,12 @@ static const VMStateDescription vmstate_vapic =3D { =20 static void vapic_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *sc =3D SYS_BUS_DEVICE_CLASS(klass); DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->no_user =3D 1; dc->reset =3D vapic_reset; dc->vmsd =3D &vmstate_vapic; - sc->init =3D vapic_init; + dc->realize =3D vapic_realize; } =20 static const TypeInfo vapic_type =3D { --=20 1.8.1.4