From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33407) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmKT-0007MA-3b for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TcmKS-0000Ff-41 for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:41 -0500 Received: from cantor2.suse.de ([195.135.220.15]:46217 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmKR-0000FX-Tx for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:40 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 26 Nov 2012 01:12:17 +0100 Message-Id: <1353888766-6951-6-git-send-email-afaerber@suse.de> In-Reply-To: <1353888766-6951-1-git-send-email-afaerber@suse.de> References: <1353888766-6951-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] [RFC 05/34] isa: Split off instance_init for ISADevice List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws Signed-off-by: Andreas F=C3=A4rber --- hw/isa-bus.c | 14 ++++++++++---- 1 Datei ge=C3=A4ndert, 10 Zeilen hinzugef=C3=BCgt(+), 4 Zeilen entfernt(= -) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 144a88e..2b1fc40 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -124,9 +124,6 @@ static int isa_qdev_init(DeviceState *qdev) ISADevice *dev =3D ISA_DEVICE(qdev); ISADeviceClass *klass =3D ISA_DEVICE_GET_CLASS(dev); =20 - dev->isairq[0] =3D -1; - dev->isairq[1] =3D -1; - if (klass->init) { return klass->init(dev); } @@ -134,6 +131,14 @@ static int isa_qdev_init(DeviceState *qdev) return 0; } =20 +static void isa_device_init(Object *obj) +{ + ISADevice *dev =3D ISA_DEVICE(obj); + + dev->isairq[0] =3D -1; + dev->isairq[1] =3D -1; +} + ISADevice *isa_create(ISABus *bus, const char *name) { DeviceState *dev; @@ -229,10 +234,11 @@ static void isa_device_class_init(ObjectClass *klas= s, void *data) k->bus_type =3D TYPE_ISA_BUS; } =20 -static TypeInfo isa_device_type_info =3D { +static const TypeInfo isa_device_type_info =3D { .name =3D TYPE_ISA_DEVICE, .parent =3D TYPE_DEVICE, .instance_size =3D sizeof(ISADevice), + .instance_init =3D isa_device_init, .abstract =3D true, .class_size =3D sizeof(ISADeviceClass), .class_init =3D isa_device_class_init, --=20 1.7.10.4