From: Andrew Cooper Date: Fri, 4 Jan 2013 09:06:47 +0000 (+0100) Subject: passthrough/domctl: use correct struct in union X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7483^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=78559a477ba0deb03a4b279475606ff3c09efe31;p=xen.git passthrough/domctl: use correct struct in union This appears to be a copy paste error from c/s 23861:ec7c81fbe0de. It is safe, functionally speaking, as both the xen_domctl_assign_device and xen_domctl_get_device_group structure start with a 'uint32_t machine_sbdf'. We should however use the correct union structure. Signed-off-by: Andrew Cooper Committed-by: Jan Beulich --- 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;