From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwpdU-0008Lk-I5 for qemu-devel@nongnu.org; Wed, 19 Oct 2016 08:06:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwpdQ-0003PL-Ni for qemu-devel@nongnu.org; Wed, 19 Oct 2016 08:06:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41360) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bwpdQ-0003Oh-I3 for qemu-devel@nongnu.org; Wed, 19 Oct 2016 08:06:16 -0400 From: Igor Mammedov Date: Wed, 19 Oct 2016 14:05:42 +0200 Message-Id: <1476878743-144953-13-git-send-email-imammedo@redhat.com> In-Reply-To: <1476878743-144953-1-git-send-email-imammedo@redhat.com> References: <1476878743-144953-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 12/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 > 255. Signed-off-by: Igor Mammedov Reviewed-by: Radim Kr=C4=8Dm=C3=A1=C5=99 --- v4: - s/254/255/ in commit message (Radim) - add intel iommu example to error message (Eduardo) --- hw/i386/pc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 7b57c9d..1218b69 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" =20 /* debug PC/ISA interrupts */ //#define DEBUG_IRQ @@ -1265,6 +1266,19 @@ void pc_machine_done(Notifier *notifier, void *dat= a) sizeof(pcms->boot_cpus_le)); } } + + if (pcms->apic_id_limit > 255) { + IntelIOMMUState *iommu =3D INTEL_IOMMU_DEVICE(x86_iommu_get_defa= ult()); + + if (!iommu || !iommu->x86_iommu.intr_supported || + iommu->intr_eim !=3D ON_OFF_AUTO_ON) { + error_report("current -smp configuration requires " + "Extended Interrupt Mode enabled. " + "You can add an IOMMU using: " + "-device intel-iommu,intremap=3Don,eim=3Don"); + exit(EXIT_FAILURE); + } + } } =20 void pc_guest_info_init(PCMachineState *pcms) --=20 2.7.4