From patchwork Fri Jan 25 12:52:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 215784 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 05F5E2C008E for ; Sat, 26 Jan 2013 02:47:56 +1100 (EST) Received: from localhost ([::1]:53357 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tyimr-0006pa-3m for incoming@patchwork.ozlabs.org; Fri, 25 Jan 2013 07:53:41 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TyimU-0006Qs-1u for qemu-devel@nongnu.org; Fri, 25 Jan 2013 07:53:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TyimO-0004px-Vp for qemu-devel@nongnu.org; Fri, 25 Jan 2013 07:53:17 -0500 Received: from cantor2.suse.de ([195.135.220.15]:59291 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TyimO-0004pI-Mh; Fri, 25 Jan 2013 07:53:12 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 23FADA3A78; Fri, 25 Jan 2013 13:53:12 +0100 (CET) From: Alexander Graf To: qemu-ppc@nongnu.org Date: Fri, 25 Jan 2013 13:52:45 +0100 Message-Id: <1359118384-9555-3-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1359118384-9555-1-git-send-email-agraf@suse.de> References: <1359118384-9555-1-git-send-email-agraf@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: Blue Swirl , qemu-devel , =?utf-8?q?Aur=C3=A9lien=20Jarno?= , =?utf-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 02/21] macio: QOM'ify some more 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 From: Andreas Färber Move bar MemoryRegion initialization to an instance_init. Signed-off-by: Andreas Färber Signed-off-by: Alexander Graf --- hw/macio.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/hw/macio.c b/hw/macio.c index f01fc57..770e3bd 100644 --- a/hw/macio.c +++ b/hw/macio.c @@ -27,9 +27,15 @@ #include "pci/pci.h" #include "escc.h" +#define TYPE_MACIO "macio" +#define MACIO(obj) OBJECT_CHECK(MacIOState, (obj), TYPE_MACIO) + typedef struct MacIOState { + /*< private >*/ PCIDevice parent; + /*< public >*/ + int is_oldworld; MemoryRegion bar; MemoryRegion *pic_mem; @@ -46,7 +52,6 @@ static void macio_bar_setup(MacIOState *macio_state) int i; MemoryRegion *bar = &macio_state->bar; - memory_region_init(bar, "macio", 0x80000); if (macio_state->pic_mem) { if (macio_state->is_oldworld) { /* Heathrow PIC */ @@ -81,6 +86,13 @@ static int macio_initfn(PCIDevice *d) return 0; } +static void macio_instance_init(Object *obj) +{ + MacIOState *s = MACIO(obj); + + memory_region_init(&s->bar, "macio", 0x80000); +} + static void macio_class_init(ObjectClass *klass, void *data) { PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); @@ -90,16 +102,17 @@ static void macio_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_OTHERS << 8; } -static const TypeInfo macio_info = { - .name = "macio", +static const TypeInfo macio_type_info = { + .name = TYPE_MACIO, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(MacIOState), + .instance_init = macio_instance_init, .class_init = macio_class_init, }; static void macio_register_types(void) { - type_register_static(&macio_info); + type_register_static(&macio_type_info); } type_init(macio_register_types) @@ -114,9 +127,9 @@ void macio_init (PCIBus *bus, int device_id, int is_oldworld, MacIOState *macio_state; int i; - d = pci_create_simple(bus, -1, "macio"); + d = pci_create_simple(bus, -1, TYPE_MACIO); - macio_state = DO_UPCAST(MacIOState, parent, d); + macio_state = MACIO(d); macio_state->is_oldworld = is_oldworld; macio_state->pic_mem = pic_mem; macio_state->dbdma_mem = dbdma_mem;