[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v12 27/27] intel_iommu: disallow kernel-irqchip=on w
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v12 27/27] intel_iommu: disallow kernel-irqchip=on with IR |
Date: |
Thu, 14 Jul 2016 13:56:36 +0800 |
When user specify "intremap=on" with "-M kernel-irqchip=on", throw error
and then quit.
Signed-off-by: Peter Xu <address@hidden>
---
hw/i386/intel_iommu.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 00e6682..06cc94f 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
@@ -2450,6 +2452,7 @@ static void vtd_realize(DeviceState *dev, Error **errp)
PCMachineState *pcms = PC_MACHINE(qdev_get_machine());
PCIBus *bus = pcms->bus;
IntelIOMMUState *s = INTEL_IOMMU_DEVICE(dev);
+ X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);
VTD_DPRINTF(GENERAL, "");
memset(s->vtd_as_by_bus_num, 0, sizeof(s->vtd_as_by_bus_num));
@@ -2466,6 +2469,14 @@ 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 (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)
--
2.4.11
- [Qemu-devel] [PATCH v12 17/27] x86-iommu: introduce IEC notifiers, (continued)
- [Qemu-devel] [PATCH v12 17/27] x86-iommu: introduce IEC notifiers, Peter Xu, 2016/07/14
- [Qemu-devel] [PATCH v12 18/27] ioapic: register IOMMU IEC notifier for ioapic, Peter Xu, 2016/07/14
- [Qemu-devel] [PATCH v12 19/27] intel_iommu: Add support for Extended Interrupt Mode, Peter Xu, 2016/07/14
- [Qemu-devel] [PATCH v12 20/27] intel_iommu: add SID validation for IR, Peter Xu, 2016/07/14
- [Qemu-devel] [PATCH v12 21/27] kvm-irqchip: simplify kvm_irqchip_add_msi_route, Peter Xu, 2016/07/14
- [Qemu-devel] [PATCH v12 22/27] kvm-irqchip: i386: add hook for add/remove virq, Peter Xu, 2016/07/14
- [Qemu-devel] [PATCH v12 23/27] kvm-irqchip: x86: add msi route notify fn, Peter Xu, 2016/07/14
- [Qemu-devel] [PATCH v12 24/27] kvm-irqchip: do explicit commit when update irq, Peter Xu, 2016/07/14
- [Qemu-devel] [PATCH v12 25/27] intel_iommu: support all masks in interrupt entry cache invalidation, Peter Xu, 2016/07/14
- [Qemu-devel] [PATCH v12 26/27] kvm-all: add trace events for kvm irqchip ops, Peter Xu, 2016/07/14
- [Qemu-devel] [PATCH v12 27/27] intel_iommu: disallow kernel-irqchip=on with IR,
Peter Xu <=