From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45242) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brO5O-0006lw-AS for qemu-devel@nongnu.org; Tue, 04 Oct 2016 07:40:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brO5J-00064A-Cn for qemu-devel@nongnu.org; Tue, 04 Oct 2016 07:40:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57958) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brO5I-00063q-U9 for qemu-devel@nongnu.org; Tue, 04 Oct 2016 07:40:33 -0400 Date: Tue, 4 Oct 2016 13:40:29 +0200 From: Igor Mammedov Message-ID: <20161004134029.0c97beaa@nial.brq.redhat.com> In-Reply-To: <20160930161013.9832-5-rkrcmar@redhat.com> References: <20160930161013.9832-1-rkrcmar@redhat.com> <20160930161013.9832-5-rkrcmar@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 4/8] intel_iommu: redo configuraton check in realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Radim =?UTF-8?B?S3LEjW3DocWZ?= Cc: qemu-devel@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , Peter Xu , Paolo Bonzini , Richard Henderson On Fri, 30 Sep 2016 18:10:09 +0200 Radim Kr=C4=8Dm=C3=A1=C5=99 wrote: > * 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 > Signed-off-by: Radim Kr=C4=8Dm=C3=A1=C5=99 > --- > v3: > * use error_setg [Paolo] > * create a new function [Peter] > --- > hw/i386/intel_iommu.c | 26 ++++++++++++++++++-------- > 1 file changed, 18 insertions(+), 8 deletions(-) >=20 > diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c > index c39b62b898d8..5b06b4091f36 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" > @@ -2448,6 +2449,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()); > @@ -2457,6 +2470,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); > @@ -2471,14 +2489,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)