[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v11 28/28] intel_iommu: disallow kernel-irqchip=on w
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v11 28/28] intel_iommu: disallow kernel-irqchip=on with IR |
Date: |
Tue, 5 Jul 2016 16:19:29 +0800 |
When user specify "kernel-irqchip=on", throw error and then quit.
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
hw/i386/intel_iommu.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 8a91e64..76471ad 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -20,6 +20,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
#include "intel_iommu_internal.h"
@@ -29,6 +30,7 @@
#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
@@ -2476,6 +2478,13 @@ 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 = vtd_host_dma_iommu(bus, s, Q35_PSEUDO_DEVFN_IOAPIC);
+
+ /* Currently Intel IOMMU IR only support "kernel-irqchip={off|split}" */
+ if (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)
--
2.4.11
- [Qemu-devel] [PATCH v11 18/28] x86-iommu: introduce IEC notifiers, (continued)
- [Qemu-devel] [PATCH v11 18/28] x86-iommu: introduce IEC notifiers, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 19/28] ioapic: register IOMMU IEC notifier for ioapic, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 20/28] intel_iommu: Add support for Extended Interrupt Mode, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 21/28] intel_iommu: add SID validation for IR, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 22/28] kvm-irqchip: simplify kvm_irqchip_add_msi_route, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 23/28] kvm-irqchip: i386: add hook for add/remove virq, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 24/28] kvm-irqchip: x86: add msi route notify fn, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 25/28] kvm-irqchip: do explicit commit when update irq, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 26/28] intel_iommu: support all masks in interrupt entry cache invalidation, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 27/28] kvm-all: add trace events for kvm irqchip ops, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 28/28] intel_iommu: disallow kernel-irqchip=on with IR,
Peter Xu <=
- Re: [Qemu-devel] [PATCH v11 00/28] IOMMU: Enable interrupt remapping for Intel IOMMU, Radim Krčmář, 2016/07/08