From 29d84a9296a8d19d7bba3e99842fba908ba82f95 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 22 Jan 2019 20:27:35 -0500
Subject: [PATCH] target: Resolve repeated typedef warnings

---
 qemu/include/exec/memory.h | 1 -
 qemu/target/arm/cpu.h      | 4 ++--
 qemu/target/i386/cpu.h     | 4 ++--
 qemu/target/m68k/cpu.h     | 4 ++--
 qemu/target/mips/cpu.h     | 4 ++--
 qemu/target/sparc/cpu.h    | 4 ++--
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/qemu/include/exec/memory.h b/qemu/include/exec/memory.h
index cc27a28e..d3d992d2 100644
--- a/qemu/include/exec/memory.h
+++ b/qemu/include/exec/memory.h
@@ -37,7 +37,6 @@
 
 typedef struct MemoryRegionOps MemoryRegionOps;
 typedef struct MemoryRegionMmio MemoryRegionMmio;
-typedef struct FlatView FlatView;
 
 struct MemoryRegionMmio {
     CPUReadMemoryFunc *read[3];
diff --git a/qemu/target/arm/cpu.h b/qemu/target/arm/cpu.h
index 11f7fae0..d31337ee 100644
--- a/qemu/target/arm/cpu.h
+++ b/qemu/target/arm/cpu.h
@@ -718,7 +718,7 @@ typedef struct ARMISARegisters ARMISARegisters;
  *
  * An ARM CPU core.
  */
-typedef struct ARMCPU {
+struct ARMCPU {
     /*< private >*/
     CPUState parent_obj;
     /*< public >*/
@@ -884,7 +884,7 @@ typedef struct ARMCPU {
 
     /* Used to set the maximum vector length the cpu will support.  */
     uint32_t sve_max_vq;
-} ARMCPU;
+};
 
 static inline ARMCPU *arm_env_get_cpu(CPUARMState *env)
 {
diff --git a/qemu/target/i386/cpu.h b/qemu/target/i386/cpu.h
index 262797f2..2e59e10e 100644
--- a/qemu/target/i386/cpu.h
+++ b/qemu/target/i386/cpu.h
@@ -1313,7 +1313,7 @@ typedef struct CPUX86State {
  *
  * An x86 CPU.
  */
-typedef struct X86CPU {
+struct X86CPU {
     /*< private >*/
     CPUState parent_obj;
     /*< public >*/
@@ -1400,7 +1400,7 @@ typedef struct X86CPU {
 
     // Unicorn: Moved here to prevent a local static
     bool cpu_globals_initialized;
-} X86CPU;
+};
 
 static inline X86CPU *x86_env_get_cpu(CPUX86State *env)
 {
diff --git a/qemu/target/m68k/cpu.h b/qemu/target/m68k/cpu.h
index d7afe858..ff1d1e29 100644
--- a/qemu/target/m68k/cpu.h
+++ b/qemu/target/m68k/cpu.h
@@ -164,13 +164,13 @@ typedef struct CPUM68KState {
  *
  * A Motorola 68k CPU.
  */
-typedef struct M68kCPU {
+struct M68kCPU {
     /*< private >*/
     CPUState parent_obj;
     /*< public >*/
 
     CPUM68KState env;
-} M68kCPU;
+};
 
 static inline M68kCPU *m68k_env_get_cpu(CPUM68KState *env)
 {
diff --git a/qemu/target/mips/cpu.h b/qemu/target/mips/cpu.h
index 810fd76e..76b0c104 100644
--- a/qemu/target/mips/cpu.h
+++ b/qemu/target/mips/cpu.h
@@ -1047,13 +1047,13 @@ struct CPUMIPSState {
  *
  * A MIPS CPU.
  */
-typedef struct MIPSCPU {
+struct MIPSCPU {
     /*< private >*/
     CPUState parent_obj;
     /*< public >*/
 
     CPUMIPSState env;
-} MIPSCPU;
+};
 
 static inline MIPSCPU *mips_env_get_cpu(CPUMIPSState *env)
 {
diff --git a/qemu/target/sparc/cpu.h b/qemu/target/sparc/cpu.h
index 01cab707..fb6a9164 100644
--- a/qemu/target/sparc/cpu.h
+++ b/qemu/target/sparc/cpu.h
@@ -539,13 +539,13 @@ struct CPUSPARCState {
  *
  * A SPARC CPU.
  */
-typedef struct SPARCCPU {
+struct SPARCCPU {
     /*< private >*/
     CPUState parent_obj;
     /*< public >*/
 
     CPUSPARCState env;
-} SPARCCPU;
+};
 
 static inline SPARCCPU *sparc_env_get_cpu(CPUSPARCState *env)
 {