diff options
| author | Eduardo Habkost | 2014-12-19 02:43:35 +0100 |
|---|---|---|
| committer | Eduardo Habkost | 2015-03-09 20:30:03 +0100 |
| commit | 54a402930ac6d1a9d6d402229ae8ba8bef7e598e (patch) | |
| tree | 72208efe9c89159f24014857560ab66cd189a102 /target-i386 | |
| parent | target-i386: Move CPUX86State::cpuid_apic_id to X86CPU::apic_id (diff) | |
| download | qemu-54a402930ac6d1a9d6d402229ae8ba8bef7e598e.tar.gz qemu-54a402930ac6d1a9d6d402229ae8ba8bef7e598e.tar.xz qemu-54a402930ac6d1a9d6d402229ae8ba8bef7e598e.zip | |
target-i386: Move APIC ID compatibility code to pc.c
The APIC ID compatibility code is required only for PC, and now that
x86_cpu_initfn() doesn't use x86_cpu_apic_id_from_index() anymore, that
code can be moved to pc.c.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/cpu.c | 34 | ||||
| -rw-r--r-- | target-i386/cpu.h | 1 |
2 files changed, 0 insertions, 35 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 6dd74f073e..110716e84c 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -25,7 +25,6 @@ #include "sysemu/kvm.h" #include "sysemu/cpus.h" #include "kvm_i386.h" -#include "hw/i386/topology.h" #include "qemu/option.h" #include "qemu/config-file.h" @@ -2822,39 +2821,6 @@ out: } } -/* Enables contiguous-apic-ID mode, for compatibility */ -static bool compat_apic_id_mode; - -void enable_compat_apic_id_mode(void) -{ - compat_apic_id_mode = true; -} - -/* Calculates initial APIC ID for a specific CPU index - * - * Currently we need to be able to calculate the APIC ID from the CPU index - * alone (without requiring a CPU object), as the QEMU<->Seabios interfaces have - * no concept of "CPU index", and the NUMA tables on fw_cfg need the APIC ID of - * all CPUs up to max_cpus. - */ -uint32_t x86_cpu_apic_id_from_index(unsigned int cpu_index) -{ - uint32_t correct_id; - static bool warned; - - correct_id = x86_apicid_from_cpu_idx(smp_cores, smp_threads, cpu_index); - if (compat_apic_id_mode) { - if (cpu_index != correct_id && !warned) { - error_report("APIC IDs set in compatibility mode, " - "CPU topology won't match the configuration"); - warned = true; - } - return cpu_index; - } else { - return correct_id; - } -} - static void x86_cpu_initfn(Object *obj) { CPUState *cs = CPU(obj); diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 38bedc2c79..0638d24a88 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1328,7 +1328,6 @@ void x86_cpu_compat_kvm_no_autodisable(FeatureWord w, uint32_t features); /* Return name of 32-bit register, from a R_* constant */ const char *get_register_name_32(unsigned int reg); -uint32_t x86_cpu_apic_id_from_index(unsigned int cpu_index); void enable_compat_apic_id_mode(void); #define APIC_DEFAULT_ADDRESS 0xfee00000 |