From: Andreas Färber <afaerber@suse.de>
Date: Sat, 14 Mar 2015 13:24:37 +0000 (+0100)
Subject: pc: Suppress APIC ID compatibility warning for QTest
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b1c12027f834d50c0cf22fe8745b5d85bb87ddd0;p=qemu.git

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>
---

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index b5b2aadb52..642105f3f6 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;