diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-03 00:29:17 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-03 00:29:17 +0000 |
| commit | 0856579cac2f1dacecd847cfcd89680d26ff78f5 (patch) | |
| tree | 6ab14c4d57029b50bf6ec08b4b881bfad0625217 /hw | |
| parent | b8a173b25c887a606681fc35a46702c164d5b2d0 (diff) | |
| download | qemu-0856579cac2f1dacecd847cfcd89680d26ff78f5.zip qemu-0856579cac2f1dacecd847cfcd89680d26ff78f5.tar.gz qemu-0856579cac2f1dacecd847cfcd89680d26ff78f5.tar.bz2 | |
Revert "Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging"
This reverts commit b8a173b25c887a606681fc35a46702c164d5b2d0, reversing
changes made to 5de090464f1ec5360c4f30faa01d8a9f8826cd58.
(I applied this pull request when I should not have done so, and
am now immediately reverting it.)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/pc.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index d2e07ca..03dc007 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -25,8 +25,6 @@ #include "hw/i386/pc.h" #include "hw/char/serial.h" #include "hw/i386/apic.h" -#include "hw/i386/topology.h" -#include "sysemu/cpus.h" #include "hw/block/fdc.h" #include "hw/ide.h" #include "hw/pci/pci.h" @@ -631,39 +629,6 @@ bool e820_get_entry(int idx, uint32_t type, uint64_t *address, uint64_t *length) return false; } -/* 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; - } -} - /* Calculates the limit to CPU APIC ID values * * This function returns the limit for the APIC ID value, so that all |