From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buchc-0005vz-AC for qemu-devel@nongnu.org; Thu, 13 Oct 2016 05:53:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1buchZ-0004wZ-HO for qemu-devel@nongnu.org; Thu, 13 Oct 2016 05:53:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buchZ-0004wO-BS for qemu-devel@nongnu.org; Thu, 13 Oct 2016 05:53:25 -0400 From: Igor Mammedov Date: Thu, 13 Oct 2016 11:52:47 +0200 Message-Id: <1476352367-69400-14-git-send-email-imammedo@redhat.com> In-Reply-To: <1476352367-69400-1-git-send-email-imammedo@redhat.com> References: <1476352367-69400-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v3 13/13] pc: require IRQ remapping and EIM if there could be x2APIC CPUs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kraxel@redhat.com, ehabkost@redhat.com, liuxiaojian6@huawei.com, mst@redhat.com, rkrcmar@redhat.com, peterx@redhat.com, kevin@koconnor.net, pbonzini@redhat.com, lersek@redhat.com, chao.gao@intel.com it would prevent starting guest with incorrect configs where interrupts couldn't be delivered to CPUs with APIC IDs > 254. Signed-off-by: Igor Mammedov --- hw/i386/pc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 40eb43b..f7070e0 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -68,6 +68,7 @@ #include "qapi-visit.h" #include "qom/cpu.h" #include "hw/nmi.h" +#include "hw/i386/intel_iommu.h" /* debug PC/ISA interrupts */ //#define DEBUG_IRQ @@ -1264,6 +1265,18 @@ void pc_machine_done(Notifier *notifier, void *data) sizeof(pcms->boot_cpus_le)); } } + + if (pcms->apic_id_limit > 255) { + IntelIOMMUState *iommu = INTEL_IOMMU_DEVICE(x86_iommu_get_default()); + + if (!iommu || !iommu->x86_iommu.intr_supported || + iommu->intr_eim != ON_OFF_AUTO_ON) { + error_report("current -smp configuration requires " + "Extended Interrupt Mode enabled. " + "IOMMU should have eim=on option set"); + exit(EXIT_FAILURE); + } + } } void pc_guest_info_init(PCMachineState *pcms) -- 2.7.4