From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSqSQ-0001Uy-30 for qemu-devel@nongnu.org; Sat, 13 Sep 2014 12:45:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSqSK-0000kk-Sy for qemu-devel@nongnu.org; Sat, 13 Sep 2014 12:45:54 -0400 Sender: Richard Henderson From: Richard Henderson Date: Sat, 13 Sep 2014 09:45:16 -0700 Message-Id: <1410626734-3804-6-git-send-email-rth@twiddle.net> In-Reply-To: <1410626734-3804-1-git-send-email-rth@twiddle.net> References: <1410626734-3804-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 05/23] target-ppc: Use cpu_exec_enter qom hook List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, qemu-ppc@nongnu.org, afaerber@suse.de, aliguori@amazon.com Cc: qemu-ppc@nongnu.org Signed-off-by: Richard Henderson --- cpu-exec.c | 3 --- target-ppc/translate_init.c | 9 +++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index 9f84dda..d930e7a 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -352,9 +352,6 @@ int cpu_exec(CPUArchState *env) cpu->exit_request = 1; } -#if defined(TARGET_PPC) - env->reserve_addr = -1; -#endif cc->cpu_exec_enter(cpu); cpu->exception_index = -1; diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 48177ed..e577e03 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -9456,6 +9456,14 @@ static bool ppc_cpu_has_work(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } +static void ppc_cpu_exec_enter(CPUState *cs) +{ + PowerPCCPU *cpu = POWERPC_CPU(cs); + CPUPPCState *env = &cpu->env; + + env->reserve_addr = -1; +} + /* CPUClass::reset() */ static void ppc_cpu_reset(CPUState *s) { @@ -9638,6 +9646,7 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data) cc->write_elf64_qemunote = ppc64_cpu_write_elf64_qemunote; #endif #endif + cc->cpu_exec_enter = ppc_cpu_exec_enter; cc->gdb_num_core_regs = 71; -- 1.9.3