From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkwFT-0000yE-LZ for qemu-devel@nongnu.org; Fri, 07 Jun 2013 08:58:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UkwFQ-00085L-9N for qemu-devel@nongnu.org; Fri, 07 Jun 2013 08:58:31 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53797 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkwFQ-00084o-0a for qemu-devel@nongnu.org; Fri, 07 Jun 2013 08:58:28 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 7 Jun 2013 14:58:15 +0200 Message-Id: <1370609900-21998-8-git-send-email-afaerber@suse.de> In-Reply-To: <1370609900-21998-1-git-send-email-afaerber@suse.de> References: <1370609900-21998-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] [PATCH v2 07/12] i8259: QOM'ify some more 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 Introduce type constant. Prepares for PIC realizefn. Signed-off-by: Andreas F=C3=A4rber --- hw/intc/i8259.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c index fef00fc..1b513ff 100644 --- a/hw/intc/i8259.c +++ b/hw/intc/i8259.c @@ -41,6 +41,8 @@ //#define DEBUG_IRQ_LATENCY //#define DEBUG_IRQ_COUNT =20 +#define TYPE_I8259 "isa-i8259" + #if defined(DEBUG_PIC) || defined(DEBUG_IRQ_COUNT) static int irq_level[16]; #endif @@ -448,25 +450,28 @@ void irq_info(Monitor *mon, const QDict *qdict) qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq) { qemu_irq *irq_set; - ISADevice *dev; + DeviceState *dev; + ISADevice *isadev; int i; =20 irq_set =3D g_malloc(ISA_NUM_IRQS * sizeof(qemu_irq)); =20 - dev =3D i8259_init_chip("isa-i8259", bus, true); + isadev =3D i8259_init_chip(TYPE_I8259, bus, true); + dev =3D DEVICE(isadev); =20 - qdev_connect_gpio_out(&dev->qdev, 0, parent_irq); + qdev_connect_gpio_out(dev, 0, parent_irq); for (i =3D 0 ; i < 8; i++) { - irq_set[i] =3D qdev_get_gpio_in(&dev->qdev, i); + irq_set[i] =3D qdev_get_gpio_in(dev, i); } =20 - isa_pic =3D &dev->qdev; + isa_pic =3D dev; =20 - dev =3D i8259_init_chip("isa-i8259", bus, false); + isadev =3D i8259_init_chip(TYPE_I8259, bus, false); + dev =3D DEVICE(isadev); =20 - qdev_connect_gpio_out(&dev->qdev, 0, irq_set[2]); + qdev_connect_gpio_out(dev, 0, irq_set[2]); for (i =3D 0 ; i < 8; i++) { - irq_set[i + 8] =3D qdev_get_gpio_in(&dev->qdev, i); + irq_set[i + 8] =3D qdev_get_gpio_in(dev, i); } =20 slave_pic =3D PIC_COMMON(dev); @@ -484,7 +489,7 @@ static void i8259_class_init(ObjectClass *klass, void= *data) } =20 static const TypeInfo i8259_info =3D { - .name =3D "isa-i8259", + .name =3D TYPE_I8259, .instance_size =3D sizeof(PICCommonState), .parent =3D TYPE_PIC_COMMON, .class_init =3D i8259_class_init, --=20 1.8.1.4