[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/20] target-ppc: Start QOM'ifying CPU init
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 10/20] target-ppc: Start QOM'ifying CPU init |
Date: |
Sun, 15 Apr 2012 20:38:54 +0200 |
Move code not dependent on ppc_def_t from cpu_ppc_init() into an initfn.
Signed-off-by: Andreas Färber <address@hidden>
Acked-by: David Gibson <address@hidden>
---
target-ppc/helper.c | 3 ++-
target-ppc/translate_init.c | 9 +++++++++
2 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index 0d904dd..c5de0ea 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -3196,10 +3196,11 @@ CPUPPCState *cpu_ppc_init (const char *cpu_model)
cpu = POWERPC_CPU(object_new(TYPE_POWERPC_CPU));
env = &cpu->env;
- cpu_exec_init(env);
+
if (tcg_enabled()) {
ppc_translate_init();
}
+
env->cpu_model_str = cpu_model;
cpu_ppc_register_internal(env, def);
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index e4d15a5..5a7ac77 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -10217,6 +10217,14 @@ static void ppc_cpu_reset(CPUState *s)
cpu_state_reset(env);
}
+static void ppc_cpu_initfn(Object *obj)
+{
+ PowerPCCPU *cpu = POWERPC_CPU(obj);
+ CPUPPCState *env = &cpu->env;
+
+ cpu_exec_init(env);
+}
+
static void ppc_cpu_class_init(ObjectClass *oc, void *data)
{
PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
@@ -10230,6 +10238,7 @@ static const TypeInfo ppc_cpu_type_info = {
.name = TYPE_POWERPC_CPU,
.parent = TYPE_CPU,
.instance_size = sizeof(PowerPCCPU),
+ .instance_init = ppc_cpu_initfn,
.abstract = false,
.class_size = sizeof(PowerPCCPUClass),
.class_init = ppc_cpu_class_init,
--
1.7.7
- [Qemu-devel] [PATCH 01/20] PPC: Fix TLB invalidation bug within the PPC interrupt handler., (continued)
- [Qemu-devel] [PATCH 01/20] PPC: Fix TLB invalidation bug within the PPC interrupt handler., Andreas Färber, 2012/04/15
- [Qemu-devel] [PATCH 03/20] pseries: Fix bug with reset of VIO CRQs, Andreas Färber, 2012/04/15
- [Qemu-devel] [PATCH 02/20] pseries: Clean up hcall_dprintf() debugging messages, Andreas Färber, 2012/04/15
- [Qemu-devel] [PATCH 05/20] pseries: Remove unused fields from VIOsPAPRBus structure, Andreas Färber, 2012/04/15
- [Qemu-devel] [PATCH 04/20] pseries: Implement RTAS system-reboot call, Andreas Färber, 2012/04/15
- [Qemu-devel] [PATCH 06/20] pseries: Consolidate hack for RTAS display-character usage, Andreas Färber, 2012/04/15
- [Qemu-devel] [PATCH 07/20] target-ppc: Drop cpu_ppc_close(), Andreas Färber, 2012/04/15
- [Qemu-devel] [PATCH 09/20] target-ppc: QOM'ify CPU, Andreas Färber, 2012/04/15
- [Qemu-devel] [PATCH 11/20] target-ppc: QOM'ify CPU reset, Andreas Färber, 2012/04/15
- [Qemu-devel] [PATCH 12/20] target-ppc: Fix type casts for w64 (uintptr_t), Andreas Färber, 2012/04/15
- [Qemu-devel] [PATCH 10/20] target-ppc: Start QOM'ifying CPU init,
Andreas Färber <=
- [Qemu-devel] [PATCH 08/20] target-ppc: Add hooks for handling tcg and kvm limitations, Andreas Färber, 2012/04/15
- [Qemu-devel] [PATCH 16/20] pseries: Remove old debug leftovers from spapr_vscsi, Andreas Färber, 2012/04/15
- [Qemu-devel] [PATCH 13/20] target-ppc: Init dcache and icache size for e500 user mode, Andreas Färber, 2012/04/15
- [Qemu-devel] [PATCH 17/20] pseries: Remove old hcalls hook stub, Andreas Färber, 2012/04/15
- [Qemu-devel] [PATCH 15/20] pseries: Fix RTAS based config access, Andreas Färber, 2012/04/15
- [Qemu-devel] [PATCH 14/20] target-ppc/machine.c: Drop unnecessary ifdefs, Andreas Färber, 2012/04/15
- [Qemu-devel] [PATCH 19/20] pseries: Reset vscsi properly, Andreas Färber, 2012/04/15