ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Andreas Färber 2015-03-14 14:24:37 +01:00
parent 5a4992834d
commit b1c12027f8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/i386/pc.c
View File

@ -45,6 +45,7 @@
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "sysemu/numa.h" #include "sysemu/numa.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
#include "sysemu/qtest.h"
#include "kvm_i386.h" #include "kvm_i386.h"
#include "hw/xen/xen.h" #include "hw/xen/xen.h"
#include "sysemu/block-backend.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); correct_id = x86_apicid_from_cpu_idx(smp_cores, smp_threads, cpu_index);
if (compat_apic_id_mode) { 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, " error_report("APIC IDs set in compatibility mode, "
"CPU topology won't match the configuration"); "CPU topology won't match the configuration");
warned = true; warned = true;