From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjOBd-0002WH-2y for qemu-devel@nongnu.org; Mon, 12 Sep 2016 06:10:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bjOBW-0004c9-Uu for qemu-devel@nongnu.org; Mon, 12 Sep 2016 06:09:59 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36091) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjOBW-0004by-OU for qemu-devel@nongnu.org; Mon, 12 Sep 2016 06:09:54 -0400 Received: by mail-wm0-f66.google.com with SMTP id z194so513456wmd.3 for ; Mon, 12 Sep 2016 03:09:54 -0700 (PDT) From: David Kiarie Date: Mon, 12 Sep 2016 13:08:09 +0300 Message-Id: <1473674889-2727-7-git-send-email-davidkiarie4@gmail.com> In-Reply-To: <1473674889-2727-1-git-send-email-davidkiarie4@gmail.com> References: <1473674889-2727-1-git-send-email-davidkiarie4@gmail.com> Subject: [Qemu-devel] [v4 6/6] hw/iommu: share common code between IOMMUs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@web.de, mst@redhat.com, rkrcmar@redhat.com, peterx@redhat.com, ehabkost@redhat.com, pbonzini@redhat.com, alex.williamson@redhat.com, David Kiarie Enabling interrupt remapping with kernel_irqchip=on should result in an error for both VT-d and AMD-Vi Signed-off-by: David Kiarie --- hw/i386/intel_iommu.c | 9 --------- hw/i386/x86-iommu.c | 8 ++++++++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index e4bad6a..bf86dcc 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -30,7 +30,6 @@ #include "hw/boards.h" #include "hw/i386/x86-iommu.h" #include "hw/pci-host/q35.h" -#include "sysemu/kvm.h" /*#define DEBUG_INTEL_IOMMU*/ #ifdef DEBUG_INTEL_IOMMU @@ -2472,14 +2471,6 @@ static void vtd_realize(DeviceState *dev, Error **errp) Q35_PSEUDO_DEVFN_IOAPIC); /* Pseudo address space under root PCI bus. */ pcms->ioapic_as = vtd_host_dma_iommu(bus, s, Q35_PSEUDO_DEVFN_IOAPIC); - - /* Currently Intel IOMMU IR only support "kernel-irqchip={off|split}" */ - if (x86_iommu->intr_supported && kvm_irqchip_in_kernel() && - !kvm_irqchip_is_split()) { - error_report("Intel Interrupt Remapping cannot work with " - "kernel-irqchip=on, please use 'split|off'."); - exit(1); - } } static void vtd_class_init(ObjectClass *klass, void *data) diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index 2278af7..66510f7 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -21,6 +21,7 @@ #include "hw/sysbus.h" #include "hw/boards.h" #include "hw/i386/x86-iommu.h" +#include "sysemu/kvm.h" #include "qemu/error-report.h" #include "trace.h" @@ -84,6 +85,13 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp) if (x86_class->realize) { x86_class->realize(dev, errp); } + /* Currently IOMMU IR only support "kernel-irqchip={off|split}" */ + if (x86_iommu->intr_supported && kvm_irqchip_in_kernel() && + !kvm_irqchip_is_split()) { + error_report("Interrupt Remapping cannot work with " + "kernel-irqchip=on, please use 'split|off'."); + exit(1); + } x86_iommu_set_default(X86_IOMMU_DEVICE(dev)); } -- 2.1.4