From 60c5e1040ec2c26e8da4786f7f35fbe2a8b599d1 Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Wed, 19 Oct 2016 14:05:42 +0200 Subject: [PATCH] pc: Require IRQ remapping and EIM if there could be x2APIC CPUs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It would prevent starting guest with incorrect configs where interrupts couldn't be delivered to CPUs with APIC IDs > 255. Signed-off-by: Igor Mammedov Reviewed-by: Radim Krčmář Reviewed-by: Eduardo Habkost Signed-off-by: Eduardo Habkost --- hw/i386/pc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index f9f85bfc1a..f56ea0f87b 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 @@ -1273,6 +1274,19 @@ 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. " + "You can add an IOMMU using: " + "-device intel-iommu,intremap=on,eim=on"); + exit(EXIT_FAILURE); + } + } } void pc_guest_info_init(PCMachineState *pcms)