From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 12 Dec 2007 10:38:14 +0000 (+0000)
Subject: Fix build after I removed test_assign_device from domctl union.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14617^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=aa54a5e57e80bbe5a77e2413f1a6b08767488eb9;p=xen.git

Fix build after I removed test_assign_device from domctl union.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
index b392789d66..e6eac869a8 100644
--- a/tools/libxc/xc_domain.c
+++ b/tools/libxc/xc_domain.c
@@ -772,7 +772,7 @@ int xc_test_assign_device(
 
     domctl.cmd = XEN_DOMCTL_test_assign_device;
     domctl.domain = domid;
-    domctl.u.test_assign_device.machine_bdf = machine_bdf;
+    domctl.u.assign_device.machine_bdf = machine_bdf;
 
     return do_domctl(xc_handle, &domctl);
 }
diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index 33f83de156..1460f8e620 100644
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -533,8 +533,8 @@ long arch_do_domctl(
         if ( !vtd_enabled )
             break;
 
-        bus = (domctl->u.test_assign_device.machine_bdf >> 16) & 0xff;
-        devfn = (domctl->u.test_assign_device.machine_bdf >> 8) & 0xff;
+        bus = (domctl->u.assign_device.machine_bdf >> 16) & 0xff;
+        devfn = (domctl->u.assign_device.machine_bdf >> 8) & 0xff;
 
         if ( device_assigned(bus, devfn) )
         {