From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55087) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7yQ5-0008Sv-LX for qemu-devel@nongnu.org; Wed, 14 Mar 2012 20:19:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7yQ3-0005am-L8 for qemu-devel@nongnu.org; Wed, 14 Mar 2012 20:19:53 -0400 Received: from cantor2.suse.de ([195.135.220.15]:41273 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7yQ3-0005aZ-Ec for qemu-devel@nongnu.org; Wed, 14 Mar 2012 20:19:51 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 15 Mar 2012 01:19:42 +0100 Message-Id: <1331770782-20105-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] [PATCH urgent] target-lm32/microblaze: Drop second CPU{LM32, MB}State typedef List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , Michael Walle , mdroth@linux.vnet.ibm.com, anthony@codemonkey.ws, =?UTF-8?q?Andreas=20F=C3=A4rber?= Commit 9b9a970a23625de4ae6b7461906a9a0d98d3ca95 (target-lm32/microblaze: Typedef struct CPU{MB,LM32}State) introduced necessary typedefs for cpu_mmu_index() and mmu.h respectively. On some GCC versions this leads to "error: redefinition of typedef". Drop the original typedef to hopefully fix the build. Signed-off-by: Andreas F=C3=A4rber --- target-lm32/cpu.h | 4 ++-- target-microblaze/cpu.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target-lm32/cpu.h b/target-lm32/cpu.h index 0902a24..a7d9546 100644 --- a/target-lm32/cpu.h +++ b/target-lm32/cpu.h @@ -149,7 +149,7 @@ enum { LM32_FLAG_IGNORE_MSB =3D 1, }; =20 -typedef struct CPULM32State { +struct CPULM32State { /* general registers */ uint32_t regs[32]; =20 @@ -182,7 +182,7 @@ typedef struct CPULM32State { uint8_t num_bps; uint8_t num_wps; =20 -} CPULM32State; +}; =20 =20 CPULM32State *cpu_lm32_init(const char *cpu_model); diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h index 3b52421..33b23c2 100644 --- a/target-microblaze/cpu.h +++ b/target-microblaze/cpu.h @@ -230,7 +230,7 @@ typedef struct CPUMBState CPUMBState; #define STREAM_CONTROL (1 << 3) #define STREAM_NONBLOCK (1 << 4) =20 -typedef struct CPUMBState { +struct CPUMBState { uint32_t debug; uint32_t btaken; uint32_t btarget; @@ -264,7 +264,7 @@ typedef struct CPUMBState { #endif =20 CPU_COMMON -} CPUMBState; +}; =20 CPUMBState *cpu_mb_init(const char *cpu_model); int cpu_mb_exec(CPUMBState *s); --=20 1.7.7