Commit b1c12027 authored by Andreas Färber's avatar Andreas Färber
Browse files

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: default avatarAndreas Färber <afaerber@suse.de>
parent 5a499283

hw/i386/pc.c

+2 −1
Original line number Diff line number Diff line
@@ -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;