From patchwork Tue Jun 18 01:58:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 252092 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D83982C0299 for ; Tue, 18 Jun 2013 11:58:42 +1000 (EST) Received: from localhost ([::1]:34496 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UolBw-0006Cl-JU for incoming@patchwork.ozlabs.org; Mon, 17 Jun 2013 21:58:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UolBY-0006CB-JI for qemu-devel@nongnu.org; Mon, 17 Jun 2013 21:58:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UolBX-0001YV-A7 for qemu-devel@nongnu.org; Mon, 17 Jun 2013 21:58:16 -0400 Received: from cantor2.suse.de ([195.135.220.15]:40730 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UolBX-0001YL-1M; Mon, 17 Jun 2013 21:58:15 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 6D43DA3B99; Tue, 18 Jun 2013 03:58:14 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 18 Jun 2013 03:58:07 +0200 Message-Id: <1371520688-24949-2-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1371520688-24949-1-git-send-email-afaerber@suse.de> References: <1371520688-24949-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: scottwood@freescale.com, qemu-ppc@nongnu.org, agraf@suse.de, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 1/2] intc/openpic: QOM'ify X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Introduce type constant and cast macro. Signed-off-by: Andreas Färber Reviewed-by: Peter Crosthwaite --- 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 c788714..875c6b8 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -255,8 +255,13 @@ typedef struct IRQDest { uint32_t outputs_active[OPENPIC_OUTPUT_NB]; } IRQDest; +#define OPENPIC(obj) OBJECT_CHECK(OpenPICState, (obj), TYPE_OPENPIC) + typedef struct OpenPICState { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + MemoryRegion mem; /* Behavior control */ @@ -537,7 +542,7 @@ static void openpic_set_irq(void *opaque, int n_IRQ, int level) static void openpic_reset(DeviceState *d) { - OpenPICState *opp = FROM_SYSBUS(typeof(*opp), SYS_BUS_DEVICE(d)); + OpenPICState *opp = OPENPIC(d); int i; opp->gcr = GCR_RESET; @@ -703,7 +708,7 @@ static void openpic_gcr_write(OpenPICState *opp, uint64_t val) bool mpic_proxy = false; if (val & GCR_RESET) { - openpic_reset(&opp->busdev.qdev); + openpic_reset(DEVICE(opp)); return; } @@ -1528,7 +1533,7 @@ static void map_list(OpenPICState *opp, const MemReg *list, int *count) static int openpic_init(SysBusDevice *dev) { - OpenPICState *opp = FROM_SYSBUS(typeof (*opp), dev); + OpenPICState *opp = OPENPIC(dev); int i, j; int list_count = 0; static const MemReg list_le[] = { @@ -1621,7 +1626,7 @@ static int openpic_init(SysBusDevice *dev) } } - register_savevm(&opp->busdev.qdev, "openpic", 0, 2, + register_savevm(DEVICE(opp), "openpic", 0, 2, openpic_save, openpic_load, opp); sysbus_init_mmio(dev, &opp->mem); @@ -1647,7 +1652,7 @@ static void openpic_class_init(ObjectClass *klass, void *data) } static const TypeInfo openpic_info = { - .name = "openpic", + .name = TYPE_OPENPIC, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(OpenPICState), .class_init = openpic_class_init, diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index c9ae512..4fdd88e 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -565,7 +565,7 @@ void ppce500_init(PPCE500Params *params) /* MPIC */ mpic = g_new(qemu_irq, 256); - dev = qdev_create(NULL, "openpic"); + dev = qdev_create(NULL, TYPE_OPENPIC); qdev_prop_set_uint32(dev, "nb_cpus", smp_cpus); qdev_prop_set_uint32(dev, "model", params->mpic_version); qdev_init_nofail(dev); 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) pic = g_new(qemu_irq, 64); - dev = qdev_create(NULL, "openpic"); + dev = qdev_create(NULL, TYPE_OPENPIC); qdev_prop_set_uint32(dev, "model", OPENPIC_MODEL_RAVEN); qdev_init_nofail(dev); s = SYS_BUS_DEVICE(dev); diff --git a/include/hw/ppc/openpic.h b/include/hw/ppc/openpic.h index 9dcaf0e..9874beb 100644 --- a/include/hw/ppc/openpic.h +++ b/include/hw/ppc/openpic.h @@ -1,6 +1,8 @@ #if !defined(__OPENPIC_H__) #define __OPENPIC_H__ +#define TYPE_OPENPIC "openpic" + /* OpenPIC have 5 outputs per CPU connected and one IRQ out single output */ enum { OPENPIC_OUTPUT_INT = 0, /* IRQ */