From: Eduardo Habkost Date: Wed, 4 Mar 2015 01:54:03 +0000 (-0300) Subject: target-i386: Remove unused APIC ID default code X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0f4b210e504d7db42b96882e94481f444e420fe3;p=qemu.git target-i386: Remove unused APIC ID default code The existing apic_id = cpu_index code has no visible effect: the PC code already initializes the APIC ID according to the topology on pc_new_cpu(), and linux-user memcpy()s the CPU state (including cpuid_apic_id) on cpu_copy(). Remove the dead code and simply let APIC ID to to be 0 by default. This doesn't change behavior of PC because apic-id is already explicitly set, and doesn't affect linux-user because APIC ID was already always 0. Reviewed-by: Paolo Bonzini Reviewed-by: Andreas Färber Signed-off-by: Eduardo Habkost --- diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 2f3a4504ea..3e1a0e7822 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2901,7 +2901,6 @@ static void x86_cpu_initfn(Object *obj) NULL, NULL, (void *)cpu->filtered_features, NULL); cpu->hyperv_spinlock_attempts = HYPERV_SPINLOCK_NEVER_RETRY; - env->cpuid_apic_id = x86_cpu_apic_id_from_index(cs->cpu_index); x86_cpu_load_def(cpu, xcc->cpu_def, &error_abort);