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 <[email protected]>
Reviewed-by: Andreas Färber <[email protected]>
Signed-off-by: Eduardo Habkost <[email protected]>

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 2f3a4504eae7dbc87431444fa9ec775f0f068c0a..3e1a0e78229a2917b180e16c6a33d315bcb22d84 100644 (file)
--- 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);