[Qemu-devel] [PATCH B/AB] Remove NO_CPU_IO_DEFS

[Blue Swirl]

Signed-off-by: Blue Swirl <address@hidden>
---
 target-i386/cpu.h  |    2 --
 target-ppc/cpu.h   |    2 --
 target-sparc/cpu.h |    2 --
 tcg/tcg.c          |    1 -
 translate-all.c    |    1 -
 5 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 548ab80..740c06c 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -863,9 +863,7 @@ void cpu_x86_update_cr4(CPUX86State *env, uint32_t new_cr4);
 void cpu_set_apic_base(CPUX86State *env, uint64_t val);
 uint64_t cpu_get_apic_base(CPUX86State *env);
 void cpu_set_apic_tpr(CPUX86State *env, uint8_t val);
-#ifndef NO_CPU_IO_DEFS
 uint8_t cpu_get_apic_tpr(CPUX86State *env);
-#endif

 /* hw/pc.c */
 void cpu_smm_update(CPUX86State *env);
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 2ad4486..2c024e0 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -763,7 +763,6 @@ const ppc_def_t *cpu_ppc_find_by_name (const char *name);
 int cpu_ppc_register_internal (CPUPPCState *env, const ppc_def_t *def);

 /* Time-base and decrementer management */
-#ifndef NO_CPU_IO_DEFS
 uint64_t cpu_ppc_load_tbl (CPUPPCState *env);
 uint32_t cpu_ppc_load_tbu (CPUPPCState *env);
 void cpu_ppc_store_tbu (CPUPPCState *env, uint32_t value);
@@ -797,7 +796,6 @@ void ppc_slb_invalidate_one (CPUPPCState *env, uint64_t T0);
 #endif
 int ppcemb_tlb_search (CPUPPCState *env, target_ulong address, uint32_t pid);
 #endif
-#endif

 static inline uint64_t ppc_dump_gpr(CPUPPCState *env, int gprn)
 {
diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h
index 27b020b..2325596 100644
--- a/target-sparc/cpu.h
+++ b/target-sparc/cpu.h
@@ -434,7 +434,6 @@ typedef struct CPUSPARCState {
     sparc_def_t *def;
 } CPUSPARCState;

-#ifndef NO_CPU_IO_DEFS
 /* helper.c */
 CPUSPARCState *cpu_sparc_init(const char *cpu_model);
 void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu);
@@ -487,7 +486,6 @@ static inline int tlb_compare_context(const
SparcTLBEntry *tlb,
 }

 #endif
-#endif

 /* cpu-exec.c */
 #if !defined(CONFIG_USER_ONLY)
diff --git a/tcg/tcg.c b/tcg/tcg.c
index a99ecb9..77223e6 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -52,7 +52,6 @@
 /* Note: the long term plan is to reduce the dependancies on the QEMU
    CPU definitions. Currently they are used for qemu_ld/st
    instructions */
-#define NO_CPU_IO_DEFS
 #include "cpu.h"
 #include "exec-all.h"

diff --git a/translate-all.c b/translate-all.c
index 91cbbc4..d741f53 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -24,7 +24,6 @@

 #include "config.h"

-#define NO_CPU_IO_DEFS
 #include "cpu.h"
 #include "exec-all.h"
 #include "disas.h"
-- 
1.6.2.4