summaryrefslogtreecommitdiffstats
path: root/system/xen/xsa/xsa302-4.12-0001-IOMMU-add-missing-HVM-check.patch
diff options
context:
space:
mode:
Diffstat (limited to 'system/xen/xsa/xsa302-4.12-0001-IOMMU-add-missing-HVM-check.patch')
-rw-r--r--system/xen/xsa/xsa302-4.12-0001-IOMMU-add-missing-HVM-check.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/system/xen/xsa/xsa302-4.12-0001-IOMMU-add-missing-HVM-check.patch b/system/xen/xsa/xsa302-4.12-0001-IOMMU-add-missing-HVM-check.patch
deleted file mode 100644
index 5d52163406..0000000000
--- a/system/xen/xsa/xsa302-4.12-0001-IOMMU-add-missing-HVM-check.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0c9c0fbb356e3210cb77b3d738be50981b26058a Mon Sep 17 00:00:00 2001
-From: Jan Beulich <jbeulich@suse.com>
-Date: Wed, 2 Oct 2019 13:36:59 +0200
-Subject: [PATCH 1/2] IOMMU: add missing HVM check
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix an unguarded d->arch.hvm access in assign_device().
-
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
-Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
-
-(cherry picked from commit 41fd1009cd7416b73d745a77c24b4e8d1a296fe6)
-Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
----
- xen/drivers/passthrough/pci.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c
-index 8108ed5f9a..d7420bd8bf 100644
---- a/xen/drivers/passthrough/pci.c
-+++ b/xen/drivers/passthrough/pci.c
-@@ -1452,7 +1452,8 @@ static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn, u32 flag)
-
- /* Prevent device assign if mem paging or mem sharing have been
- * enabled for this domain */
-- if ( unlikely(d->arch.hvm.mem_sharing_enabled ||
-+ if ( unlikely((is_hvm_domain(d) &&
-+ d->arch.hvm.mem_sharing_enabled) ||
- vm_event_check_ring(d->vm_event_paging) ||
- p2m_get_hostp2m(d)->global_logdirty) )
- return -EXDEV;
---
-2.11.0
-