From: Igor Mammedov Date: Thu, 24 Aug 2017 16:31:43 +0000 (+0200) Subject: x86: replace cpu_x86_init() with cpu_generic_init() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a7a1c09b41dfcc24dc8a18f674d4a55530be9925;p=qemu.git x86: replace cpu_x86_init() with cpu_generic_init() it's just a wrapper, drop it and use cpu_generic_init() directly Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost Message-Id: <1503592308-93913-21-git-send-email-imammedo@redhat.com> Signed-off-by: Eduardo Habkost --- diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6617e01a72..f81576d11d 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -2686,11 +2686,6 @@ static gchar *x86_gdb_arch_name(CPUState *cs) #endif } -X86CPU *cpu_x86_init(const char *cpu_model) -{ - return X86_CPU(cpu_generic_init(TYPE_X86_CPU, cpu_model)); -} - static void x86_cpu_cpudef_class_init(ObjectClass *oc, void *data) { X86CPUDefinition *cpudef = data; diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 051867399b..525d35d836 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1327,7 +1327,6 @@ int x86_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); void x86_cpu_exec_enter(CPUState *cpu); void x86_cpu_exec_exit(CPUState *cpu); -X86CPU *cpu_x86_init(const char *cpu_model); void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf); int cpu_x86_support_mca_broadcast(CPUX86State *env); @@ -1507,7 +1506,7 @@ 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(cpu_x86_init(cpu_model)) +#define cpu_init(cpu_model) cpu_generic_init(TYPE_X86_CPU, cpu_model) #define cpu_signal_handler cpu_x86_signal_handler #define cpu_list x86_cpu_list