# HG changeset patch # User Andrew Cooper # Date 1357290407 -3600 # Node ID 8fd5635f451b073ddc99e928c975e8a7743d1321 # Parent c4114a042410d3bdec3a77c30b2e85366d7fbe1d 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 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -592,7 +592,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; @@ -621,7 +621,7 @@ int iommu_do_domctl( if ( ret ) goto assign_device_out; - 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; @@ -649,7 +649,7 @@ int iommu_do_domctl( if ( ret ) goto deassign_device_out; - 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;