From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO72U-0005Ff-B0 for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:55:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WO72P-0005v1-G9 for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:55:18 -0400 Received: from cantor2.suse.de ([195.135.220.15]:59673 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO72P-0005ul-9d for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:55:13 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 13 Mar 2014 15:54:11 +0100 Message-Id: <1394722501-32326-9-git-send-email-afaerber@suse.de> In-Reply-To: <1394722501-32326-1-git-send-email-afaerber@suse.de> References: <1394722501-32326-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL for-2.0-rc0 08/58] target-unicore32: Clean up ENV_GET_CPU() usage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , Peter Maydell , Guan Xuetao , =?UTF-8?q?Andreas=20F=C3=A4rber?= Commit fdfba1a298ae26dd44bcfdb0429314139a0bc55a added a usage of ENV_GET_CPU() macro in target-specific code. Use uc32_env_get_cpu() instead. Cc: Edgar E. Iglesias Cc: Peter Maydell Signed-off-by: Andreas F=C3=A4rber --- target-unicore32/softmmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-unicore32/softmmu.c b/target-unicore32/softmmu.c index 22defc6..9552f69 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 =3D ENV_GET_CPU(env); + CPUState *cs =3D CPU(uc32_env_get_cpu(env)); int code; uint32_t table; uint32_t desc; --=20 1.8.4.5