aboutsummaryrefslogtreecommitdiffstats
path: root/xen
diff options
context:
space:
mode:
authorIan Campbell <ijc@hellion.org.uk>2013-01-04 15:58:37 +0000
committerIan Campbell <ijc@hellion.org.uk>2013-01-04 15:58:37 +0000
commitdca9a796edd522591faa2f69c345110243fa2d93 (patch)
tree6baf6c8d4fca78d9c2c9d7068c12ea58eeec1352 /xen
parent01775697ca620e7baa43f9eb9c9b07b903c6c3cb (diff)
parent78559a477ba0deb03a4b279475606ff3c09efe31 (diff)
downloadxen-dca9a796edd522591faa2f69c345110243fa2d93.tar.gz
xen-dca9a796edd522591faa2f69c345110243fa2d93.tar.bz2
xen-dca9a796edd522591faa2f69c345110243fa2d93.zip
merge
Diffstat (limited to 'xen')
-rw-r--r--xen/drivers/passthrough/iommu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c
index 1cd0007542..2d584d2a77 100644
--- a/xen/drivers/passthrough/iommu.c
+++ b/xen/drivers/passthrough/iommu.c
@@ -591,7 +591,7 @@ int iommu_do_domctl(
if ( ret )
break;
- seg = domctl->u.get_device_group.machine_sbdf >> 16;
+ seg = domctl->u.assign_device.machine_sbdf >> 16;
bus = (domctl->u.assign_device.machine_sbdf >> 8) & 0xff;
devfn = domctl->u.assign_device.machine_sbdf & 0xff;
@@ -615,7 +615,7 @@ int iommu_do_domctl(
if ( ret )
break;
- seg = domctl->u.get_device_group.machine_sbdf >> 16;
+ seg = domctl->u.assign_device.machine_sbdf >> 16;
bus = (domctl->u.assign_device.machine_sbdf >> 8) & 0xff;
devfn = domctl->u.assign_device.machine_sbdf & 0xff;
@@ -634,7 +634,7 @@ int iommu_do_domctl(
if ( ret )
break;
- seg = domctl->u.get_device_group.machine_sbdf >> 16;
+ seg = domctl->u.assign_device.machine_sbdf >> 16;
bus = (domctl->u.assign_device.machine_sbdf >> 8) & 0xff;
devfn = domctl->u.assign_device.machine_sbdf & 0xff;