From: Andreas Färber <afaerber@suse.de>
Date: Sun, 9 Mar 2014 18:58:13 +0000 (+0100)
Subject: target-unicore32: Clean up ENV_GET_CPU() usage
X-Git-Tag: v2.0.0-rc0~4^2~50
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=62864712b3c585545365e332a041b515e319a3b8;p=users%2Fdwmw2%2Fqemu.git

target-unicore32: Clean up ENV_GET_CPU() usage

Commit fdfba1a298ae26dd44bcfdb0429314139a0bc55a added a usage of
ENV_GET_CPU() macro in target-specific code.

Use uc32_env_get_cpu() instead.

Cc: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/target-unicore32/softmmu.c b/target-unicore32/softmmu.c
index 22defc6db9..9552f69228 100644
--- a/target-unicore32/softmmu.c
+++ b/target-unicore32/softmmu.c
@@ -121,7 +121,7 @@ static int get_phys_addr_ucv2(CPUUniCore32State *env, uint32_t address,
         int access_type, int is_user, uint32_t *phys_ptr, int *prot,
         target_ulong *page_size)
 {
-    CPUState *cs = ENV_GET_CPU(env);
+    CPUState *cs = CPU(uc32_env_get_cpu(env));
     int code;
     uint32_t table;
     uint32_t desc;