diff options
author | Eduardo Habkost <ehabkost@redhat.com> | 2013-01-22 18:25:09 -0200 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2013-01-27 14:34:27 +0100 |
commit | 8932cfdf7b95734c9b4a114b8ed0b4527af77ce7 (patch) | |
tree | ea92b07d04ffd7d3dfe7771e63fa343b44e32304 /target-i386/cpu.c | |
parent | 247c9de13f9d54a94734875000a9faea8168c8ca (diff) | |
download | hqemu-8932cfdf7b95734c9b4a114b8ed0b4527af77ce7.zip hqemu-8932cfdf7b95734c9b4a114b8ed0b4527af77ce7.tar.gz |
pc: Generate APIC IDs according to CPU topology
This keeps compatibility on machine-types pc-1.2 and older, and prints a
warning in case the requested configuration won't get the correct
topology.
I couldn't think of a better way to warn about broken topology when in
compat mode other than using error_report(). The warning message will
probably be buried in a log file somewhere, but it's better than
nothing.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-i386/cpu.c')
-rw-r--r-- | target-i386/cpu.c | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 75dc973..c5acaa7 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -23,6 +23,8 @@ #include "cpu.h" #include "sysemu/kvm.h" +#include "sysemu/cpus.h" +#include "topology.h" #include "qemu/option.h" #include "qemu/config-file.h" @@ -2194,6 +2196,14 @@ void x86_cpu_realize(Object *obj, Error **errp) cpu_reset(CPU(cpu)); } +/* 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 @@ -2203,10 +2213,20 @@ void x86_cpu_realize(Object *obj, Error **errp) */ uint32_t x86_cpu_apic_id_from_index(unsigned int cpu_index) { - /* right now APIC ID == CPU index. this will eventually change to use - * the CPU topology configuration properly - */ - return 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) |