[Xen-changelog] [xen-4.2-testing] passthrough/domctl: use correct struct in union

[Xen patchbot-4.2-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
# Date 1357725114 -3600
# Node ID b2b486d4331f6b3bb43bda8fc62b6a9b32d7b8ba
# Parent  5fd008a07f25e9e32d2f87431dfe9e48d2047c29
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 <andrew.cooper3@xxxxxxxxxx>
xen-unstable changeset: 26320:8fd5635f451b
xen-unstable date: Fri Jan  4 09:06:47 UTC 2013
---


diff -r 5fd008a07f25 -r b2b486d4331f xen/drivers/passthrough/iommu.c
--- a/xen/drivers/passthrough/iommu.c   Wed Jan 09 10:49:50 2013 +0100
+++ b/xen/drivers/passthrough/iommu.c   Wed Jan 09 10:51:54 2013 +0100
@@ -585,7 +585,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;
 
@@ -614,7 +614,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;
 
@@ -642,7 +642,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;
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog