From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54954) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwC58-00010k-LA for qemu-devel@nongnu.org; Mon, 17 Oct 2016 13:52:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwC57-0002qj-S1 for qemu-devel@nongnu.org; Mon, 17 Oct 2016 13:52:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34918) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bwC57-0002qU-KP for qemu-devel@nongnu.org; Mon, 17 Oct 2016 13:52:13 -0400 From: Eduardo Habkost Date: Mon, 17 Oct 2016 15:51:31 -0200 Message-Id: <1476726698-14661-15-git-send-email-ehabkost@redhat.com> In-Reply-To: <1476726698-14661-1-git-send-email-ehabkost@redhat.com> References: <1476726698-14661-1-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 14/21] intel_iommu: redo configuraton check in realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Paolo Bonzini , Richard Henderson , qemu-devel@nongnu.org, =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= From: Radim Kr=C4=8Dm=C3=A1=C5=99 * there no point in configuring the device if realization is going to fail, so move the check to the beginning, * create a separate function for the check, * use error_setg() instead error_report(). Reviewed-by: Igor Mammedov Reviewed-by: Peter Xu Signed-off-by: Radim Kr=C4=8Dm=C3=A1=C5=99 Signed-off-by: Eduardo Habkost --- hw/i386/intel_iommu.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index d22a51c..29cd2ae 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -21,6 +21,7 @@ =20 #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qapi/error.h" #include "hw/sysbus.h" #include "exec/address-spaces.h" #include "intel_iommu_internal.h" @@ -2460,6 +2461,18 @@ static AddressSpace *vtd_host_dma_iommu(PCIBus *bu= s, void *opaque, int devfn) return &vtd_as->as; } =20 +static bool vtd_check_config(X86IOMMUState *x86_iommu, Error **errp) +{ + /* 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_setg(errp, "Intel Interrupt Remapping cannot work with " + "kernel-irqchip=3Don, please use 'split|off'.")= ; + return false; + } + return true; +} + static void vtd_realize(DeviceState *dev, Error **errp) { PCMachineState *pcms =3D PC_MACHINE(qdev_get_machine()); @@ -2469,6 +2482,11 @@ static void vtd_realize(DeviceState *dev, Error **= errp) =20 VTD_DPRINTF(GENERAL, ""); x86_iommu->type =3D TYPE_INTEL; + + if (!vtd_check_config(x86_iommu, errp)) { + return; + } + 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); @@ -2483,14 +2501,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.7.4