- add xorg-x11-util-devel to BuildRequires to get lndir(1)
- remove xen.migrate.tools_notify_restore_to_hangup_during_migration_--abort_if_busy.patch It changed migration protocol and upstream wants a different solution - bnc#802221 - fix xenpaging readd xenpaging.qemu.flush-cache.patch - Upstream patches from Jan 26891-x86-S3-Fix-cpu-pool-scheduling-after-suspend-resume.patch 26930-x86-EFI-fix-runtime-call-status-for-compat-mode-Dom0.patch - Additional fix for bnc#816159 CVE-2013-1918-xsa45-followup.patch - bnc#817068 - Xen guest with >1 sr-iov vf won't start xen-managed-pci-device.patch - Update to Xen 4.2.2 c/s 26064 The following recent security patches are included in the tarball CVE-2013-0151-xsa34.patch (bnc#797285) CVE-2012-6075-xsa41.patch (bnc#797523) CVE-2013-1917-xsa44.patch (bnc#813673) CVE-2013-1919-xsa46.patch (bnc#813675) - Upstream patch from Jan 26902-x86-EFI-pass-boot-services-variable-info-to-runtime-code.patch - bnc#816159 - VUL-0: xen: CVE-2013-1918: XSA-45: Several long latency operations are not preemptible CVE-2013-1918-xsa45-1-vcpu-destroy-pagetables-preemptible.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=237
This commit is contained in:
@@ -12,9 +12,11 @@ IOMMU: adjust (re)assign operation parameters
|
||||
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
||||
Acked-by: "Zhang, Xiantao" <xiantao.zhang@intel.com>
|
||||
|
||||
--- a/xen/drivers/passthrough/amd/pci_amd_iommu.c
|
||||
+++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c
|
||||
@@ -328,34 +328,31 @@ void amd_iommu_disable_domain_device(str
|
||||
Index: xen-4.2.2-testing/xen/drivers/passthrough/amd/pci_amd_iommu.c
|
||||
===================================================================
|
||||
--- xen-4.2.2-testing.orig/xen/drivers/passthrough/amd/pci_amd_iommu.c
|
||||
+++ xen-4.2.2-testing/xen/drivers/passthrough/amd/pci_amd_iommu.c
|
||||
@@ -333,34 +333,31 @@ void amd_iommu_disable_domain_device(str
|
||||
disable_ats_device(iommu->seg, bus, devfn);
|
||||
}
|
||||
|
||||
@@ -59,7 +61,7 @@ Acked-by: "Zhang, Xiantao" <xiantao.zhang@intel.com>
|
||||
|
||||
/* IO page tables might be destroyed after pci-detach the last device
|
||||
* In this case, we have to re-allocate root table for next pci-attach.*/
|
||||
@@ -364,17 +361,18 @@ static int reassign_device( struct domai
|
||||
@@ -369,17 +366,18 @@ static int reassign_device( struct domai
|
||||
|
||||
amd_iommu_setup_domain_device(target, iommu, bdf);
|
||||
AMD_IOMMU_DEBUG("Re-assign %04x:%02x:%02x.%u from dom%d to dom%d\n",
|
||||
@@ -83,7 +85,7 @@ Acked-by: "Zhang, Xiantao" <xiantao.zhang@intel.com>
|
||||
|
||||
if ( ivrs_mappings[req_id].unity_map_enable )
|
||||
{
|
||||
@@ -386,7 +384,7 @@ static int amd_iommu_assign_device(struc
|
||||
@@ -391,7 +389,7 @@ static int amd_iommu_assign_device(struc
|
||||
ivrs_mappings[req_id].read_permission);
|
||||
}
|
||||
|
||||
@@ -92,7 +94,7 @@ Acked-by: "Zhang, Xiantao" <xiantao.zhang@intel.com>
|
||||
}
|
||||
|
||||
static void deallocate_next_page_table(struct page_info* pg, int level)
|
||||
@@ -451,12 +449,6 @@ static void amd_iommu_domain_destroy(str
|
||||
@@ -456,12 +454,6 @@ static void amd_iommu_domain_destroy(str
|
||||
amd_iommu_flush_all_pages(d);
|
||||
}
|
||||
|
||||
@@ -105,7 +107,7 @@ Acked-by: "Zhang, Xiantao" <xiantao.zhang@intel.com>
|
||||
static int amd_iommu_add_device(struct pci_dev *pdev)
|
||||
{
|
||||
struct amd_iommu *iommu;
|
||||
@@ -596,7 +588,7 @@ const struct iommu_ops amd_iommu_ops = {
|
||||
@@ -601,7 +593,7 @@ const struct iommu_ops amd_iommu_ops = {
|
||||
.teardown = amd_iommu_domain_destroy,
|
||||
.map_page = amd_iommu_map_page,
|
||||
.unmap_page = amd_iommu_unmap_page,
|
||||
@@ -114,8 +116,10 @@ Acked-by: "Zhang, Xiantao" <xiantao.zhang@intel.com>
|
||||
.get_device_group_id = amd_iommu_group_id,
|
||||
.update_ire_from_apic = amd_iommu_ioapic_update_ire,
|
||||
.update_ire_from_msi = amd_iommu_msi_msg_update_ire,
|
||||
--- a/xen/drivers/passthrough/iommu.c
|
||||
+++ b/xen/drivers/passthrough/iommu.c
|
||||
Index: xen-4.2.2-testing/xen/drivers/passthrough/iommu.c
|
||||
===================================================================
|
||||
--- xen-4.2.2-testing.orig/xen/drivers/passthrough/iommu.c
|
||||
+++ xen-4.2.2-testing/xen/drivers/passthrough/iommu.c
|
||||
@@ -232,11 +232,16 @@ static int assign_device(struct domain *
|
||||
return -EXDEV;
|
||||
|
||||
@@ -158,8 +162,10 @@ Acked-by: "Zhang, Xiantao" <xiantao.zhang@intel.com>
|
||||
if ( ret )
|
||||
{
|
||||
dprintk(XENLOG_ERR VTDPREFIX,
|
||||
--- a/xen/drivers/passthrough/vtd/iommu.c
|
||||
+++ b/xen/drivers/passthrough/vtd/iommu.c
|
||||
Index: xen-4.2.2-testing/xen/drivers/passthrough/vtd/iommu.c
|
||||
===================================================================
|
||||
--- xen-4.2.2-testing.orig/xen/drivers/passthrough/vtd/iommu.c
|
||||
+++ xen-4.2.2-testing/xen/drivers/passthrough/vtd/iommu.c
|
||||
@@ -1689,17 +1689,10 @@ out:
|
||||
static int reassign_device_ownership(
|
||||
struct domain *source,
|
||||
@@ -203,7 +209,7 @@ Acked-by: "Zhang, Xiantao" <xiantao.zhang@intel.com>
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -2207,36 +2203,26 @@ int __init intel_vtd_setup(void)
|
||||
@@ -2222,36 +2218,26 @@ int __init intel_vtd_setup(void)
|
||||
}
|
||||
|
||||
static int intel_iommu_assign_device(
|
||||
@@ -247,8 +253,10 @@ Acked-by: "Zhang, Xiantao" <xiantao.zhang@intel.com>
|
||||
{
|
||||
ret = 0;
|
||||
goto done;
|
||||
--- a/xen/include/xen/iommu.h
|
||||
+++ b/xen/include/xen/iommu.h
|
||||
Index: xen-4.2.2-testing/xen/include/xen/iommu.h
|
||||
===================================================================
|
||||
--- xen-4.2.2-testing.orig/xen/include/xen/iommu.h
|
||||
+++ xen-4.2.2-testing/xen/include/xen/iommu.h
|
||||
@@ -123,13 +123,13 @@ struct iommu_ops {
|
||||
int (*add_device)(struct pci_dev *pdev);
|
||||
int (*enable_device)(struct pci_dev *pdev);
|
||||
|
Reference in New Issue
Block a user