From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpZSb-0002gV-Ut for qemu-devel@nongnu.org; Thu, 29 Sep 2016 07:25:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpZSU-00038x-9d for qemu-devel@nongnu.org; Thu, 29 Sep 2016 07:25:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59614) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpZSU-00038p-3i for qemu-devel@nongnu.org; Thu, 29 Sep 2016 07:24:58 -0400 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Date: Thu, 29 Sep 2016 13:23:26 +0200 Message-Id: <20160929112329.2408-5-rkrcmar@redhat.com> In-Reply-To: <20160929112329.2408-1-rkrcmar@redhat.com> References: <20160929112329.2408-1-rkrcmar@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 4/7] intel-iommu: exit on invalid configuraton earlier List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Xu , Igor Mammedov , Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" No point in configuring the device if realization is going to fail. Signed-off-by: Radim Kr=C4=8Dm=C3=A1=C5=99 --- hw/i386/intel_iommu.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index c39b62b898d8..eb488c14625d 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -2457,6 +2457,15 @@ static void vtd_realize(DeviceState *dev, Error **= errp) =20 VTD_DPRINTF(GENERAL, ""); x86_iommu->type =3D TYPE_INTEL; + + /* Currently Intel IOMMU IR only support "kernel-irqchip=3D{off|spli= t}" */ + if (x86_iommu->intr_supported && kvm_irqchip_in_kernel() && + !kvm_irqchip_is_split()) { + error_report("Intel Interrupt Remapping cannot work with " + "kernel-irqchip=3Don, please use 'split|off'."); + exit(1); + } + memset(s->vtd_as_by_bus_num, 0, sizeof(s->vtd_as_by_bus_num)); memory_region_init_io(&s->csrmem, OBJECT(s), &vtd_mem_ops, s, "intel_iommu", DMAR_REG_SIZE); @@ -2471,14 +2480,6 @@ static void vtd_realize(DeviceState *dev, Error **= errp) pci_setup_iommu(bus, vtd_host_dma_iommu, dev); /* Pseudo address space under root PCI bus. */ pcms->ioapic_as =3D vtd_host_dma_iommu(bus, s, Q35_PSEUDO_DEVFN_IOAP= IC); - - /* Currently Intel IOMMU IR only support "kernel-irqchip=3D{off|spli= t}" */ - if (x86_iommu->intr_supported && kvm_irqchip_in_kernel() && - !kvm_irqchip_is_split()) { - error_report("Intel Interrupt Remapping cannot work with " - "kernel-irqchip=3Don, please use 'split|off'."); - exit(1); - } } =20 static void vtd_class_init(ObjectClass *klass, void *data) --=20 2.10.0