On Tue, Jan 23, 2018 at 09:08:23AM +0100, Igor Mammedov wrote: > cpu_init(cpu_model) were replaced by cpu_create(cpu_type) so > no users are left, remove it. > > Signed-off-by: Igor Mammedov <imamm...@redhat.com>
ppc parts Acked-by: David Gibson <da...@gibson.dropbear.id.au> > --- > CC: Richard Henderson <r...@twiddle.net> (maintainer:Alpha) > CC: Peter Maydell <peter.mayd...@linaro.org> > CC: "Edgar E. Iglesias" <edgar.igles...@gmail.com> > CC: Eduardo Habkost <ehabk...@redhat.com> > CC: Michael Walle <mich...@walle.cc> > CC: Laurent Vivier <laur...@vivier.eu> > CC: Aurelien Jarno <aurel...@aurel32.net> > CC: Yongbok Kim <yongbok....@mips.com> > CC: Anthony Green <gr...@moxielogic.com> > CC: Chris Wulff <crwu...@gmail.com> > CC: Marek Vasut <ma...@denx.de> > CC: Stafford Horne <sho...@gmail.com> > CC: David Gibson <da...@gibson.dropbear.id.au> > CC: Alexander Graf <ag...@suse.de> > CC: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> > CC: Artyom Tarasenko <atar4q...@gmail.com> > CC: Bastian Koppelmann <kbast...@mail.uni-paderborn.de> > CC: Guan Xuetao <g...@mprc.pku.edu.cn> > CC: Max Filippov <jcmvb...@gmail.com> > CC: qemu-...@nongnu.org > CC: qemu-...@nongnu.org > CC: qemu-s3...@nongnu.org > --- > target/alpha/cpu.h | 2 -- > target/arm/cpu.h | 2 -- > target/cris/cpu.h | 2 -- > target/hppa/cpu.h | 1 - > target/i386/cpu.h | 2 -- > target/lm32/cpu.h | 2 -- > target/m68k/cpu.h | 2 -- > target/microblaze/cpu.h | 1 - > target/mips/cpu.h | 2 -- > target/moxie/cpu.h | 2 -- > target/nios2/cpu.h | 1 - > target/openrisc/cpu.h | 2 -- > target/ppc/cpu.h | 2 -- > target/s390x/cpu.h | 2 -- > target/sh4/cpu.h | 2 -- > target/sparc/cpu.h | 4 ---- > target/tilegx/cpu.h | 1 - > target/tricore/cpu.h | 2 -- > target/unicore32/cpu.h | 2 -- > target/xtensa/cpu.h | 2 -- > 20 files changed, 38 deletions(-) > > diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h > index 21ed5d6..b3bec21 100644 > --- a/target/alpha/cpu.h > +++ b/target/alpha/cpu.h > @@ -468,8 +468,6 @@ enum { > > void alpha_translate_init(void); > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_ALPHA_CPU, cpu_model) > - > #define ALPHA_CPU_TYPE_SUFFIX "-" TYPE_ALPHA_CPU > #define ALPHA_CPU_TYPE_NAME(model) model ALPHA_CPU_TYPE_SUFFIX > #define CPU_RESOLVING_TYPE TYPE_ALPHA_CPU > diff --git a/target/arm/cpu.h b/target/arm/cpu.h > index f9fb141..b37d266 100644 > --- a/target/arm/cpu.h > +++ b/target/arm/cpu.h > @@ -2167,8 +2167,6 @@ static inline bool arm_excp_unmasked(CPUState *cs, > unsigned int excp_idx, > return unmasked || pstate_unmasked; > } > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_ARM_CPU, cpu_model) > - > #define ARM_CPU_TYPE_SUFFIX "-" TYPE_ARM_CPU > #define ARM_CPU_TYPE_NAME(name) (name ARM_CPU_TYPE_SUFFIX) > #define CPU_RESOLVING_TYPE TYPE_ARM_CPU > diff --git a/target/cris/cpu.h b/target/cris/cpu.h > index 1a27653..db80cb1 100644 > --- a/target/cris/cpu.h > +++ b/target/cris/cpu.h > @@ -267,8 +267,6 @@ enum { > #define TARGET_PHYS_ADDR_SPACE_BITS 32 > #define TARGET_VIRT_ADDR_SPACE_BITS 32 > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_CRIS_CPU, cpu_model) > - > #define CRIS_CPU_TYPE_SUFFIX "-" TYPE_CRIS_CPU > #define CRIS_CPU_TYPE_NAME(name) (name CRIS_CPU_TYPE_SUFFIX) > #define CPU_RESOLVING_TYPE TYPE_CRIS_CPU > diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h > index b92ae3f..628d7de 100644 > --- a/target/hppa/cpu.h > +++ b/target/hppa/cpu.h > @@ -112,7 +112,6 @@ static inline int cpu_mmu_index(CPUHPPAState *env, bool > ifetch) > > void hppa_translate_init(void); > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_HPPA_CPU, cpu_model) > #define CPU_RESOLVING_TYPE TYPE_HPPA_CPU > > void hppa_cpu_list(FILE *f, fprintf_function cpu_fprintf); > diff --git a/target/i386/cpu.h b/target/i386/cpu.h > index 82c7381..1ed60b0 100644 > --- a/target/i386/cpu.h > +++ b/target/i386/cpu.h > @@ -1564,8 +1564,6 @@ uint64_t cpu_get_tsc(CPUX86State *env); > > #define PHYS_ADDR_MASK MAKE_64BIT_MASK(0, TCG_PHYS_ADDR_BITS) > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_X86_CPU, cpu_model) > - > #define X86_CPU_TYPE_SUFFIX "-" TYPE_X86_CPU > #define X86_CPU_TYPE_NAME(name) (name X86_CPU_TYPE_SUFFIX) > #define CPU_RESOLVING_TYPE TYPE_X86_CPU > diff --git a/target/lm32/cpu.h b/target/lm32/cpu.h > index 0656052..53939e5 100644 > --- a/target/lm32/cpu.h > +++ b/target/lm32/cpu.h > @@ -255,8 +255,6 @@ void lm32_watchpoint_insert(CPULM32State *env, int index, > target_ulong address, > void lm32_watchpoint_remove(CPULM32State *env, int index); > bool lm32_cpu_do_semihosting(CPUState *cs); > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_LM32_CPU, cpu_model) > - > #define LM32_CPU_TYPE_SUFFIX "-" TYPE_LM32_CPU > #define LM32_CPU_TYPE_NAME(model) model LM32_CPU_TYPE_SUFFIX > #define CPU_RESOLVING_TYPE TYPE_LM32_CPU > diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h > index 8a4299a..7d64804 100644 > --- a/target/m68k/cpu.h > +++ b/target/m68k/cpu.h > @@ -401,8 +401,6 @@ void register_m68k_insns (CPUM68KState *env); > #define TARGET_PHYS_ADDR_SPACE_BITS 32 > #define TARGET_VIRT_ADDR_SPACE_BITS 32 > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_M68K_CPU, cpu_model) > - > #define M68K_CPU_TYPE_SUFFIX "-" TYPE_M68K_CPU > #define M68K_CPU_TYPE_NAME(model) model M68K_CPU_TYPE_SUFFIX > #define CPU_RESOLVING_TYPE TYPE_M68K_CPU > diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h > index 492f9f7..a0ea421 100644 > --- a/target/microblaze/cpu.h > +++ b/target/microblaze/cpu.h > @@ -343,7 +343,6 @@ int cpu_mb_signal_handler(int host_signum, void *pinfo, > #define TARGET_PHYS_ADDR_SPACE_BITS 32 > #define TARGET_VIRT_ADDR_SPACE_BITS 32 > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_MICROBLAZE_CPU, cpu_model) > #define CPU_RESOLVING_TYPE TYPE_MICROBLAZE_CPU > > #define cpu_signal_handler cpu_mb_signal_handler > diff --git a/target/mips/cpu.h b/target/mips/cpu.h > index 0fcbfb3..cfe1735 100644 > --- a/target/mips/cpu.h > +++ b/target/mips/cpu.h > @@ -739,8 +739,6 @@ enum { > > int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc); > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_MIPS_CPU, cpu_model) > - > #define MIPS_CPU_TYPE_SUFFIX "-" TYPE_MIPS_CPU > #define MIPS_CPU_TYPE_NAME(model) model MIPS_CPU_TYPE_SUFFIX > #define CPU_RESOLVING_TYPE TYPE_MIPS_CPU > diff --git a/target/moxie/cpu.h b/target/moxie/cpu.h > index 3f94a5a..5f8d10b 100644 > --- a/target/moxie/cpu.h > +++ b/target/moxie/cpu.h > @@ -120,8 +120,6 @@ void moxie_translate_init(void); > int cpu_moxie_signal_handler(int host_signum, void *pinfo, > void *puc); > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_MOXIE_CPU, cpu_model) > - > #define MOXIE_CPU_TYPE_SUFFIX "-" TYPE_MOXIE_CPU > #define MOXIE_CPU_TYPE_NAME(model) model MOXIE_CPU_TYPE_SUFFIX > #define CPU_RESOLVING_TYPE TYPE_MOXIE_CPU > diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h > index 2234bff..8897e9a 100644 > --- a/target/nios2/cpu.h > +++ b/target/nios2/cpu.h > @@ -231,7 +231,6 @@ void nios2_check_interrupts(CPUNios2State *env); > # define TARGET_VIRT_ADDR_SPACE_BITS 32 > #endif > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_NIOS2_CPU, cpu_model) > #define CPU_RESOLVING_TYPE TYPE_NIOS2_CPU > > #define cpu_gen_code cpu_nios2_gen_code > diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h > index 9b32ea4..6f843fa 100644 > --- a/target/openrisc/cpu.h > +++ b/target/openrisc/cpu.h > @@ -390,8 +390,6 @@ int cpu_openrisc_get_phys_data(OpenRISCCPU *cpu, > int *prot, target_ulong address, int rw); > #endif > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_OPENRISC_CPU, cpu_model) > - > #define OPENRISC_CPU_TYPE_SUFFIX "-" TYPE_OPENRISC_CPU > #define OPENRISC_CPU_TYPE_NAME(model) model OPENRISC_CPU_TYPE_SUFFIX > #define CPU_RESOLVING_TYPE TYPE_OPENRISC_CPU > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h > index d5f2f3d..32c51fb 100644 > --- a/target/ppc/cpu.h > +++ b/target/ppc/cpu.h > @@ -1376,8 +1376,6 @@ static inline uint64_t ppc_dump_gpr(CPUPPCState *env, > int gprn) > int ppc_dcr_read (ppc_dcr_t *dcr_env, int dcrn, uint32_t *valp); > int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, uint32_t val); > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_POWERPC_CPU, cpu_model) > - > #define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU > #define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX > #define CPU_RESOLVING_TYPE TYPE_POWERPC_CPU > diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h > index b2121cb..b3bfcf5 100644 > --- a/target/s390x/cpu.h > +++ b/target/s390x/cpu.h > @@ -727,8 +727,6 @@ void s390_set_qemu_cpu_model(uint16_t type, uint8_t gen, > uint8_t ec_ga, > > > /* helper.c */ > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_S390_CPU, cpu_model) > - > #define S390_CPU_TYPE_SUFFIX "-" TYPE_S390_CPU > #define S390_CPU_TYPE_NAME(name) (name S390_CPU_TYPE_SUFFIX) > #define CPU_RESOLVING_TYPE TYPE_S390_CPU > diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h > index 709e0ca..c6418ef 100644 > --- a/target/sh4/cpu.h > +++ b/target/sh4/cpu.h > @@ -274,8 +274,6 @@ int cpu_sh4_is_cached(CPUSH4State * env, target_ulong > addr); > > void cpu_load_tlb(CPUSH4State * env); > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_SUPERH_CPU, cpu_model) > - > #define SUPERH_CPU_TYPE_SUFFIX "-" TYPE_SUPERH_CPU > #define SUPERH_CPU_TYPE_NAME(model) model SUPERH_CPU_TYPE_SUFFIX > #define CPU_RESOLVING_TYPE TYPE_SUPERH_CPU > diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h > index 345b39a..28f254d 100644 > --- a/target/sparc/cpu.h > +++ b/target/sparc/cpu.h > @@ -654,10 +654,6 @@ hwaddr cpu_get_phys_page_nofault(CPUSPARCState *env, > target_ulong addr, > #endif > int cpu_sparc_signal_handler(int host_signum, void *pinfo, void *puc); > > -#ifndef NO_CPU_IO_DEFS > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_SPARC_CPU, cpu_model) > -#endif > - > #define SPARC_CPU_TYPE_SUFFIX "-" TYPE_SPARC_CPU > #define SPARC_CPU_TYPE_NAME(model) model SPARC_CPU_TYPE_SUFFIX > #define CPU_RESOLVING_TYPE TYPE_SPARC_CPU > diff --git a/target/tilegx/cpu.h b/target/tilegx/cpu.h > index a73215e..238f8d3 100644 > --- a/target/tilegx/cpu.h > +++ b/target/tilegx/cpu.h > @@ -164,7 +164,6 @@ static inline TileGXCPU *tilegx_env_get_cpu(CPUTLGState > *env) > void tilegx_tcg_init(void); > int cpu_tilegx_signal_handler(int host_signum, void *pinfo, void *puc); > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_TILEGX_CPU, cpu_model) > #define CPU_RESOLVING_TYPE TYPE_TILEGX_CPU > > #define cpu_signal_handler cpu_tilegx_signal_handler > diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h > index a2ef632..13d629d 100644 > --- a/target/tricore/cpu.h > +++ b/target/tricore/cpu.h > @@ -411,8 +411,6 @@ static inline void cpu_get_tb_cpu_state(CPUTriCoreState > *env, target_ulong *pc, > *flags = 0; > } > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_TRICORE_CPU, cpu_model) > - > #define TRICORE_CPU_TYPE_SUFFIX "-" TYPE_TRICORE_CPU > #define TRICORE_CPU_TYPE_NAME(model) model TRICORE_CPU_TYPE_SUFFIX > #define CPU_RESOLVING_TYPE TYPE_TRICORE_CPU > diff --git a/target/unicore32/cpu.h b/target/unicore32/cpu.h > index 9644b07..5ff8b98 100644 > --- a/target/unicore32/cpu.h > +++ b/target/unicore32/cpu.h > @@ -165,8 +165,6 @@ static inline int cpu_mmu_index(CPUUniCore32State *env, > bool ifetch) > > #include "exec/cpu-all.h" > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model) > - > #define UNICORE32_CPU_TYPE_SUFFIX "-" TYPE_UNICORE32_CPU > #define UNICORE32_CPU_TYPE_NAME(model) model UNICORE32_CPU_TYPE_SUFFIX > #define CPU_RESOLVING_TYPE TYPE_UNICORE32_CPU > diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h > index 23dbd45..6481c3b 100644 > --- a/target/xtensa/cpu.h > +++ b/target/xtensa/cpu.h > @@ -509,8 +509,6 @@ void xtensa_cpu_do_unaligned_access(CPUState *cpu, vaddr > addr, > #endif > #define XTENSA_DEFAULT_CPU_TYPE > XTENSA_CPU_TYPE_NAME(XTENSA_DEFAULT_CPU_MODEL) > > -#define cpu_init(cpu_model) cpu_generic_init(TYPE_XTENSA_CPU, cpu_model) > - > void xtensa_translate_init(void); > void xtensa_breakpoint_handler(CPUState *cs); > void xtensa_finalize_config(XtensaConfig *config); -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature