Received: from eggs.gnu.org ([2001:4830:134:3::10]:33993) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ut6hc-0003ci-Df 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 1Ut6hX-0007cG-TZ for qemu-devel@nongnu.org; Sat, 29 Jun 2013 21:45:20 -0400 From: Alexander Graf Date: Sun, 30 Jun 2013 03:44:46 +0200 Message-Id: <1372556709-23868-10-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 09/32] intc/openpic: QOM'ify 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 Introduce type constant and cast macro. Signed-off-by: Andreas F=C3=A4rber Reviewed-by: Peter Crosthwaite Signed-off-by: Alexander Graf --- hw/intc/openpic.c | 17 +++++++++++------ hw/ppc/e500.c | 2 +- hw/ppc/mac_newworld.c | 2 +- include/hw/ppc/openpic.h | 2 ++ 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index ae42149..fc2d104 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -251,8 +251,13 @@ typedef struct IRQDest { uint32_t outputs_active[OPENPIC_OUTPUT_NB]; } IRQDest; =20 +#define OPENPIC(obj) OBJECT_CHECK(OpenPICState, (obj), TYPE_OPENPIC) + typedef struct OpenPICState { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + MemoryRegion mem; =20 /* Behavior control */ @@ -533,7 +538,7 @@ static void openpic_set_irq(void *opaque, int n_IRQ, = int level) =20 static void openpic_reset(DeviceState *d) { - OpenPICState *opp =3D FROM_SYSBUS(typeof(*opp), SYS_BUS_DEVICE(d)); + OpenPICState *opp =3D OPENPIC(d); int i; =20 opp->gcr =3D GCR_RESET; @@ -699,7 +704,7 @@ static void openpic_gcr_write(OpenPICState *opp, uint= 64_t val) bool mpic_proxy =3D false; =20 if (val & GCR_RESET) { - openpic_reset(&opp->busdev.qdev); + openpic_reset(DEVICE(opp)); return; } =20 @@ -1524,7 +1529,7 @@ static void map_list(OpenPICState *opp, const MemRe= g *list, int *count) =20 static int openpic_init(SysBusDevice *dev) { - OpenPICState *opp =3D FROM_SYSBUS(typeof (*opp), dev); + OpenPICState *opp =3D OPENPIC(dev); int i, j; int list_count =3D 0; static const MemReg list_le[] =3D { @@ -1617,7 +1622,7 @@ static int openpic_init(SysBusDevice *dev) } } =20 - register_savevm(&opp->busdev.qdev, "openpic", 0, 2, + register_savevm(DEVICE(opp), "openpic", 0, 2, openpic_save, openpic_load, opp); =20 sysbus_init_mmio(dev, &opp->mem); @@ -1643,7 +1648,7 @@ static void openpic_class_init(ObjectClass *klass, = void *data) } =20 static const TypeInfo openpic_info =3D { - .name =3D "openpic", + .name =3D TYPE_OPENPIC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(OpenPICState), .class_init =3D openpic_class_init, diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index d38a688..3797fbc 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -479,7 +479,7 @@ static DeviceState *ppce500_init_mpic_qemu(PPCE500Par= ams *params, SysBusDevice *s; int i, j, k; =20 - dev =3D qdev_create(NULL, "openpic"); + dev =3D qdev_create(NULL, TYPE_OPENPIC); qdev_prop_set_uint32(dev, "model", params->mpic_version); qdev_prop_set_uint32(dev, "nb_cpus", smp_cpus); =20 diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index ce44e95..61c25a4 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -329,7 +329,7 @@ static void ppc_core99_init(QEMUMachineInitArgs *args= ) =20 pic =3D g_new(qemu_irq, 64); =20 - dev =3D qdev_create(NULL, "openpic"); + dev =3D qdev_create(NULL, TYPE_OPENPIC); qdev_prop_set_uint32(dev, "model", OPENPIC_MODEL_RAVEN); qdev_init_nofail(dev); s =3D SYS_BUS_DEVICE(dev); diff --git a/include/hw/ppc/openpic.h b/include/hw/ppc/openpic.h index 1fe4865..ef3f5c3 100644 --- a/include/hw/ppc/openpic.h +++ b/include/hw/ppc/openpic.h @@ -4,6 +4,8 @@ #include "qemu-common.h" #include "hw/qdev.h" =20 +#define TYPE_OPENPIC "openpic" + /* OpenPIC have 5 outputs per CPU connected and one IRQ out single outpu= t */ enum { OPENPIC_OUTPUT_INT =3D 0, /* IRQ */ --=20 1.8.1.4