From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqJY6-0001Ju-Pd for qemu-devel@nongnu.org; Sat, 22 Jun 2013 04:52:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UqJY0-0003dK-MA for qemu-devel@nongnu.org; Sat, 22 Jun 2013 04:51:58 -0400 Received: from [222.73.24.84] (port=12713 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqJXz-0003ZE-Sz for qemu-devel@nongnu.org; Sat, 22 Jun 2013 04:51:52 -0400 From: Hu Tao Date: Sat, 22 Jun 2013 16:50:36 +0800 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 24/26] ioapic: use realize for ioapic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Cc: Paolo Bonzini , Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Igor Mammedov , Anthony Liguori Cc: Paolo Bonzini Cc: "Andreas F=C3=A4rber" Cc: Anthony Liguori Cc: Igor Mammedov Signed-off-by: Hu Tao --- hw/intc/ioapic=5Fcommon.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/intc/ioapic=5Fcommon.c b/hw/intc/ioapic=5Fcommon.c index 5c5bb3c..6077024 100644 --- a/hw/intc/ioapic=5Fcommon.c +++ b/hw/intc/ioapic=5Fcommon.c @@ -57,14 +57,15 @@ static int ioapic=5Fdispatch=5Fpost=5Fload(void *opaque= , int version=5Fid) return 0; } =20 -static int ioapic=5Finit=5Fcommon(SysBusDevice *dev) +static void ioapic=5Fcommon=5Frealize(DeviceState *dev, Error **errp) { IOAPICCommonState *s =3D IOAPIC=5FCOMMON(dev); IOAPICCommonClass *info; static int ioapic=5Fno; =20 if (ioapic=5Fno >=3D MAX=5FIOAPICS) { - return -1; + error=5Fsetg (errp, "invalid ioapic number: %d", ioapic=5Fno); + return; } =20 info =3D IOAPIC=5FCOMMON=5FGET=5FCLASS(s); @@ -72,8 +73,6 @@ static int ioapic=5Finit=5Fcommon(SysBusDevice *dev) =20 sysbus=5Finit=5Fmmio(&s->busdev, &s->io=5Fmemory); ioapic=5Fno++; - - return 0; } =20 static const VMStateDescription vmstate=5Fioapic=5Fcommon =3D { @@ -95,10 +94,9 @@ static const VMStateDescription vmstate=5Fioapic=5Fcommo= n =3D { =20 static void ioapic=5Fcommon=5Fclass=5Finit(ObjectClass *klass, void *data) { - SysBusDeviceClass *sc =3D SYS=5FBUS=5FDEVICE=5FCLASS(klass); DeviceClass *dc =3D DEVICE=5FCLASS(klass); =20 - sc->init =3D ioapic=5Finit=5Fcommon; + dc->realize =3D ioapic=5Fcommon=5Frealize; dc->vmsd =3D &vmstate=5Fioapic=5Fcommon; dc->no=5Fuser =3D 1; } --=20 1.8.3.1 =