Received: from eggs.gnu.org ([2001:4830:134:3::10]:34011) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ut6hc-0003cm-Sr for qemu-devel@nongnu.org; Sat, 29 Jun 2013 21:45:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ut6hY-0007cb-1O for qemu-devel@nongnu.org; Sat, 29 Jun 2013 21:45:20 -0400 From: Alexander Graf Date: Sun, 30 Jun 2013 03:44:47 +0200 Message-Id: <1372556709-23868-11-git-send-email-agraf@suse.de> In-Reply-To: <1372556709-23868-1-git-send-email-agraf@suse.de> References: <1372556709-23868-1-git-send-email-agraf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 10/32] intc/openpic: Convert to QOM realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc@nongnu.org Cc: Blue Swirl , qemu-devel@nongnu.org, Aurelien Jarno , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Andreas F=C3=A4rber Split qdev initfn into instance_init and realize functions. Change one occurrence of "klass" while at it. Signed-off-by: Andreas F=C3=A4rber Reviewed-by: Peter Crosthwaite Signed-off-by: Alexander Graf --- hw/intc/openpic.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index fc2d104..a26c641 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -1527,8 +1527,16 @@ static void map_list(OpenPICState *opp, const MemR= eg *list, int *count) } } =20 -static int openpic_init(SysBusDevice *dev) +static void openpic_init(Object *obj) { + OpenPICState *opp =3D OPENPIC(obj); + + memory_region_init(&opp->mem, "openpic", 0x40000); +} + +static void openpic_realize(DeviceState *dev, Error **errp) +{ + SysBusDevice *d =3D SYS_BUS_DEVICE(dev); OpenPICState *opp =3D OPENPIC(dev); int i, j; int list_count =3D 0; @@ -1562,8 +1570,6 @@ static int openpic_init(SysBusDevice *dev) {NULL} }; =20 - memory_region_init(&opp->mem, "openpic", 0x40000); - switch (opp->model) { case OPENPIC_MODEL_FSL_MPIC_20: default: @@ -1606,9 +1612,9 @@ static int openpic_init(SysBusDevice *dev) opp->brr1 =3D -1; opp->mpic_mode_mask =3D GCR_MODE_MIXED; =20 - /* Only UP supported today */ if (opp->nb_cpus !=3D 1) { - return -EINVAL; + error_setg(errp, "Only UP supported today"); + return; } =20 map_list(opp, list_le, &list_count); @@ -1618,17 +1624,15 @@ static int openpic_init(SysBusDevice *dev) for (i =3D 0; i < opp->nb_cpus; i++) { opp->dst[i].irqs =3D g_new(qemu_irq, OPENPIC_OUTPUT_NB); for (j =3D 0; j < OPENPIC_OUTPUT_NB; j++) { - sysbus_init_irq(dev, &opp->dst[i].irqs[j]); + sysbus_init_irq(d, &opp->dst[i].irqs[j]); } } =20 - register_savevm(DEVICE(opp), "openpic", 0, 2, + register_savevm(dev, "openpic", 0, 2, openpic_save, openpic_load, opp); =20 - sysbus_init_mmio(dev, &opp->mem); - qdev_init_gpio_in(&dev->qdev, openpic_set_irq, opp->max_irq); - - return 0; + sysbus_init_mmio(d, &opp->mem); + qdev_init_gpio_in(dev, openpic_set_irq, opp->max_irq); } =20 static Property openpic_properties[] =3D { @@ -1637,12 +1641,11 @@ static Property openpic_properties[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 -static void openpic_class_init(ObjectClass *klass, void *data) +static void openpic_class_init(ObjectClass *oc, void *data) { - DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(oc); =20 - k->init =3D openpic_init; + dc->realize =3D openpic_realize; dc->props =3D openpic_properties; dc->reset =3D openpic_reset; } @@ -1651,6 +1654,7 @@ static const TypeInfo openpic_info =3D { .name =3D TYPE_OPENPIC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(OpenPICState), + .instance_init =3D openpic_init, .class_init =3D openpic_class_init, }; =20 --=20 1.8.1.4