From patchwork Sat Feb 16 15:45:01 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: 221002 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 D81342C0080 for ; Sun, 17 Feb 2013 04:27:43 +1100 (EST) Received: from localhost ([::1]:49640 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6k14-0004VG-7I for incoming@patchwork.ozlabs.org; Sat, 16 Feb 2013 10:49:30 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6k0g-00048a-Nt for qemu-devel@nongnu.org; Sat, 16 Feb 2013 10:49:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U6k0a-0002GN-3K for qemu-devel@nongnu.org; Sat, 16 Feb 2013 10:49:06 -0500 Received: from cantor2.suse.de ([195.135.220.15]:40344 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6k0Z-0002GD-NW; Sat, 16 Feb 2013 10:48:59 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 2AC40A398D; Sat, 16 Feb 2013 16:48:59 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sat, 16 Feb 2013 16:45:01 +0100 Message-Id: <1361029542-8412-7-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1361029542-8412-1-git-send-email-afaerber@suse.de> References: <1361029542-8412-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: "open list:PowerPC" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Subject: [Qemu-devel] [PATCH 06/47] target-ppc: Update PowerPCCPU to QOM realizefn 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 Adapt ppc_cpu_realize() signature, hook it up to DeviceClass and set realized = true in cpu_ppc_init(). Reviewed-by: Eduardo Habkost Signed-off-by: Andreas Färber --- target-ppc/cpu-qom.h | 2 ++ target-ppc/translate_init.c | 12 +++++++++--- 2 Dateien geändert, 11 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) diff --git a/target-ppc/cpu-qom.h b/target-ppc/cpu-qom.h index b338f8f..2b82cdb 100644 --- a/target-ppc/cpu-qom.h +++ b/target-ppc/cpu-qom.h @@ -40,6 +40,7 @@ /** * PowerPCCPUClass: + * @parent_realize: The parent class' realize handler. * @parent_reset: The parent class' reset handler. * * A PowerPC CPU model. @@ -49,6 +50,7 @@ typedef struct PowerPCCPUClass { CPUClass parent_class; /*< public >*/ + DeviceRealize parent_realize; void (*parent_reset)(CPUState *cpu); /* TODO inline fields here */ diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 6cebaa1..49eaeac 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -10030,9 +10030,9 @@ static int ppc_fixup_cpu(PowerPCCPU *cpu) return 0; } -static void ppc_cpu_realize(Object *obj, Error **errp) +static void ppc_cpu_realizefn(DeviceState *dev, Error **errp) { - PowerPCCPU *cpu = POWERPC_CPU(obj); + PowerPCCPU *cpu = POWERPC_CPU(dev); CPUPPCState *env = &cpu->env; PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu); ppc_def_t *def = pcc->info; @@ -10083,6 +10083,8 @@ static void ppc_cpu_realize(Object *obj, Error **errp) qemu_init_vcpu(env); + pcc->parent_realize(dev, errp); + #if defined(PPC_DUMP_CPU) { const char *mmu_model, *excp_model, *bus_model; @@ -10354,7 +10356,7 @@ PowerPCCPU *cpu_ppc_init(const char *cpu_model) env->cpu_model_str = cpu_model; - ppc_cpu_realize(OBJECT(cpu), &err); + object_property_set_bool(OBJECT(cpu), true, "realized", &err); if (err != NULL) { fprintf(stderr, "%s\n", error_get_pretty(err)); error_free(err); @@ -10575,6 +10577,10 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data) { PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc); CPUClass *cc = CPU_CLASS(oc); + DeviceClass *dc = DEVICE_CLASS(oc); + + pcc->parent_realize = dc->realize; + dc->realize = ppc_cpu_realizefn; pcc->parent_reset = cc->reset; cc->reset = ppc_cpu_reset;