[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v10 27/26] intel_iommu: disallow kernel-irqchip=on w
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v10 27/26] intel_iommu: disallow kernel-irqchip=on with IR |
Date: |
Fri, 24 Jun 2016 15:10:21 +0800 |
When user specify "kernel-irqchip=on", throw error and then quit.
Signed-off-by: Peter Xu <address@hidden>
---
One more patch for this series. Without this one, guest kernel will
possibly hang. This is not user friendly.
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 4ff9a24..618b0f9 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
@@ -2458,6 +2460,13 @@ static void vtd_realize(DeviceState *dev, Error **errp)
bus->iommu_opaque = 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 v10 00/26] IOMMU: Enable interrupt remapping for Intel IOMMU, Peter Xu, 2016/06/21
- [Qemu-devel] [PATCH v10 01/26] x86-iommu: introduce parent class, Peter Xu, 2016/06/21
- [Qemu-devel] [PATCH v10 27/26] intel_iommu: disallow kernel-irqchip=on with IR,
Peter Xu <=
- [Qemu-devel] [PATCH v10 02/26] x86-iommu: provide x86_iommu_get_default, Peter Xu, 2016/06/21
- [Qemu-devel] [PATCH v10 04/26] x86-iommu: introduce "intremap" property, Peter Xu, 2016/06/21
- [Qemu-devel] [PATCH v10 03/26] x86-iommu: q35: generalize find_add_as(), Peter Xu, 2016/06/21
- [Qemu-devel] [PATCH v10 05/26] acpi: enable INTR for DMAR report structure, Peter Xu, 2016/06/21
- [Qemu-devel] [PATCH v10 06/26] intel_iommu: allow queued invalidation for IR, Peter Xu, 2016/06/21
- [Qemu-devel] [PATCH v10 07/26] intel_iommu: set IR bit for ECAP register, Peter Xu, 2016/06/21
- [Qemu-devel] [PATCH v10 08/26] acpi: add DMAR scope definition for root IOAPIC, Peter Xu, 2016/06/21
- [Qemu-devel] [PATCH v10 09/26] intel_iommu: define interrupt remap table addr register, Peter Xu, 2016/06/21
- [Qemu-devel] [PATCH v10 10/26] intel_iommu: handle interrupt remap enable, Peter Xu, 2016/06/21