diff options
| author | Andreas Färber <afaerber@suse.de> | 2015-03-14 14:24:37 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2015-03-17 14:50:44 +0100 |
| commit | b1c12027f834d50c0cf22fe8745b5d85bb87ddd0 (patch) | |
| tree | 633638c75fb68625be2058bb99331447a1b3b1f7 /hw/i386 | |
| parent | 5a4992834daec85c3913654903fb9f4f954e585a (diff) | |
| download | qemu-b1c12027f834d50c0cf22fe8745b5d85bb87ddd0.zip qemu-b1c12027f834d50c0cf22fe8745b5d85bb87ddd0.tar.gz qemu-b1c12027f834d50c0cf22fe8745b5d85bb87ddd0.tar.bz2 | |
pc: Suppress APIC ID compatibility warning for QTest
This avoids cluttering GTester output with irrelevant warnings.
Cc: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/pc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index b5b2aad..642105f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -45,6 +45,7 @@ #include "sysemu/sysemu.h" #include "sysemu/numa.h" #include "sysemu/kvm.h" +#include "sysemu/qtest.h" #include "kvm_i386.h" #include "hw/xen/xen.h" #include "sysemu/block-backend.h" @@ -653,7 +654,7 @@ static uint32_t x86_cpu_apic_id_from_index(unsigned int cpu_index) correct_id = x86_apicid_from_cpu_idx(smp_cores, smp_threads, cpu_index); if (compat_apic_id_mode) { - if (cpu_index != correct_id && !warned) { + if (cpu_index != correct_id && !warned && !qtest_enabled()) { error_report("APIC IDs set in compatibility mode, " "CPU topology won't match the configuration"); warned = true; |