ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

intel_iommu: Throw hw_error on notify_started 

We don't currently support the MemoryRegionIOMMUOps notifier, so throw
an error should a device require it.

Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Peter Xu <peterx@redhat.com>
Tested-by: Peter Xu <peterx@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
Alex Williamson 2016-06-30 13:00:24 -06:00
parent d22d8956b1
commit 3cb3b1549f
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/i386/intel_iommu.c
View File

@ -24,6 +24,7 @@
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "intel_iommu_internal.h" #include "intel_iommu_internal.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
/*#define DEBUG_INTEL_IOMMU*/ /*#define DEBUG_INTEL_IOMMU*/
#ifdef DEBUG_INTEL_IOMMU #ifdef DEBUG_INTEL_IOMMU
@ -1871,6 +1872,16 @@ static IOMMUTLBEntry vtd_iommu_translate(MemoryRegion *iommu, hwaddr addr,
return ret; return ret;
} }
static void vtd_iommu_notify_started(MemoryRegion *iommu)
{
VTDAddressSpace *vtd_as = container_of(iommu, VTDAddressSpace, iommu);
hw_error("Device at bus %s addr %02x.%d requires iommu notifier which "
"is currently not supported by intel-iommu emulation",
vtd_as->bus->qbus.name, PCI_SLOT(vtd_as->devfn),
PCI_FUNC(vtd_as->devfn));
}
static const VMStateDescription vtd_vmstate = { static const VMStateDescription vtd_vmstate = {
.name = "iommu-intel", .name = "iommu-intel",
.unmigratable = 1, .unmigratable = 1,
@ -1938,6 +1949,7 @@ static void vtd_init(IntelIOMMUState *s)
memset(s->womask, 0, DMAR_REG_SIZE); memset(s->womask, 0, DMAR_REG_SIZE);
s->iommu_ops.translate = vtd_iommu_translate; s->iommu_ops.translate = vtd_iommu_translate;
s->iommu_ops.notify_started = vtd_iommu_notify_started;
s->root = 0; s->root = 0;
s->root_extended = false; s->root_extended = false;
s->dmar_enabled = false; s->dmar_enabled = false;