From fee2c27f2b95b43efd05eb9671cd580f5bf764a7 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Sat, 24 Feb 2018 03:20:44 -0500 Subject: [PATCH] cpu: Eliminate cpudef_init(), cpudef_setup() x86_cpudef_init() doesn't do anything anymore, cpudef_init(), cpudef_setup(), and x86_cpudef_init() can be finally removed. Backports commit 3e2c0e062f0963a6b73b0cd1990fad79495463d9 from qemu --- qemu/target-i386/cpu.c | 4 ---- qemu/target-i386/cpu.h | 2 -- 2 files changed, 6 deletions(-) diff --git a/qemu/target-i386/cpu.c b/qemu/target-i386/cpu.c index 0cf3596b..312e1b0e 100644 --- a/qemu/target-i386/cpu.c +++ b/qemu/target-i386/cpu.c @@ -2205,10 +2205,6 @@ void cpu_clear_apic_feature(CPUX86State *env) #endif /* !CONFIG_USER_ONLY */ -void x86_cpudef_setup(void) -{ -} - void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) diff --git a/qemu/target-i386/cpu.h b/qemu/target-i386/cpu.h index 32fc750f..621fddd8 100644 --- a/qemu/target-i386/cpu.h +++ b/qemu/target-i386/cpu.h @@ -1211,7 +1211,6 @@ void x86_cpu_exec_exit(CPUState *cpu); X86CPU *cpu_x86_create(struct uc_struct *uc, const char *cpu_model, Error **errp); int cpu_x86_exec(struct uc_struct *uc, CPUState *cpu); -void x86_cpudef_setup(void); int cpu_x86_support_mca_broadcast(CPUX86State *env); int cpu_get_pic_interrupt(CPUX86State *s); @@ -1391,7 +1390,6 @@ CPUX86State *cpu_x86_init_user(struct uc_struct *uc, const char *cpu_model); #ifdef TARGET_I386 #define cpu_exec cpu_x86_exec #define cpu_signal_handler cpu_x86_signal_handler -#define cpudef_setup x86_cpudef_setup #endif /* MMU modes definitions */