[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/22] target-ppc: Move cpu_exec_init() call to reali
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 06/22] target-ppc: Move cpu_exec_init() call to realize function |
Date: |
Tue, 7 Jul 2015 01:13:49 +0200 |
From: Bharata B Rao <address@hidden>
Move cpu_exec_init() call from instance_init to realize. This allows
any failures from cpu_exec_init() to be handled appropriately.
Also add corresponding cpu_exec_exit() call from unrealize.
cpu_dt_id assignment from instance_init is no longer needed since
correct assignment for cpu_dt_id is already present in realizefn.
Signed-off-by: Bharata B Rao <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
target-ppc/translate_init.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 52d95ce..2b72f2d 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -8928,6 +8928,11 @@ static void ppc_cpu_realizefn(DeviceState *dev, Error
**errp)
return;
}
+ cpu_exec_init(&cpu->env, &local_err);
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ return;
+ }
cpu->cpu_dt_id = (cs->cpu_index / smp_threads) * max_smt
+ (cs->cpu_index % smp_threads);
#endif
@@ -9141,6 +9146,8 @@ static void ppc_cpu_unrealizefn(DeviceState *dev, Error
**errp)
opc_handler_t **table;
int i, j;
+ cpu_exec_exit(CPU(dev));
+
for (i = 0; i < PPC_CPU_OPCODES_LEN; i++) {
if (env->opcodes[i] == &invalid_handler) {
continue;
@@ -9633,8 +9640,6 @@ static void ppc_cpu_initfn(Object *obj)
CPUPPCState *env = &cpu->env;
cs->env_ptr = env;
- cpu_exec_init(env, &error_abort);
- cpu->cpu_dt_id = cs->cpu_index;
env->msr_mask = pcc->msr_mask;
env->mmu_model = pcc->mmu_model;
--
2.1.4
- [Qemu-devel] [PULL 00/22] QOM CPUState patch queue 2015-07-06, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 01/22] cpu: No need to zero-initialize CPUState::numa_node, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 02/22] cpu: Initialize breakpoint/watchpoint lists in cpu_common_initfn(), Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 03/22] cpu: Reorder cpu->as, cpu->thread_id, cpu->memory_dispatch init, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 05/22] cpu: Convert cpu_index into a bitmap, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 06/22] target-ppc: Move cpu_exec_init() call to realize function,
Andreas Färber <=
- [Qemu-devel] [PULL 04/22] cpu: Add Error argument to cpu_exec_init(), Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 09/22] cpu: Change tcg_cpu_exec() arg to cpu, not env, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 12/22] cpu: Add wrapper for the set_pc() hook, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 07/22] translate-all: Change tb_flush() env argument to cpu, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 08/22] gdbstub: Change gdbserver_fork() to accept cpu instead of env, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 15/22] microblaze: boot: Use cpu_set_pc(), Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 13/22] gdbstub: Use cpu_set_pc() helper, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 14/22] hw/arm/boot: Use cpu_set_pc(), Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 10/22] cpu: Change cpu_exec_init() arg to cpu, not env, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 17/22] disas: QOMify target specific setup, Andreas Färber, 2015/07/06