From: Andreas Färber <afaerber@suse.de>
Date: Fri, 21 Jun 2013 15:00:04 +0000 (+0200)
Subject: target-ppc: Don't overuse ENV_GET_CPU()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=09c6a63a6144bbfe2fe434e84d16dd4db6028b6a;p=qemu.git

target-ppc: Don't overuse ENV_GET_CPU()

Commit b632a148b677b773ff155f9de840b37a653567b9 (target-ppc: QOM method
dispatch for MMU fault handling) introduced a use of ENV_GET_CPU()
inside target-ppc/ code. Use ppc_env_get_cpu() instead.

Purely cosmetic, non-functional change to aid in locating and removing
ENV_GET_CPU() usages.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c
index 385b67ab23..e4e111c555 100644
--- a/target-ppc/mmu_helper.c
+++ b/target-ppc/mmu_helper.c
@@ -2890,7 +2890,7 @@ void helper_booke206_tlbflush(CPUPPCState *env, uint32_t type)
 void tlb_fill(CPUPPCState *env, target_ulong addr, int is_write, int mmu_idx,
               uintptr_t retaddr)
 {
-    CPUState *cpu = ENV_GET_CPU(env);
+    CPUState *cpu = CPU(ppc_env_get_cpu(env));
     PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
     int ret;