[xen-unstable] Fix build after I removed test_assign_device from domctl union.

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen-unstable] Fix build after I removed test_assign_device from domctl union.

Xen patchbot-unstable
# HG changeset patch
# User Keir Fraser <[hidden email]>
# Date 1197455894 0
# Node ID 23febc32fc1b8fbf1753dbec3abb003357267ab5
# Parent  ef83b50fc4a43368bf9531f88edfab3906549395
Fix build after I removed test_assign_device from domctl union.
Signed-off-by: Keir Fraser <[hidden email]>
---
 tools/libxc/xc_domain.c |    2 +-
 xen/arch/x86/domctl.c   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -r ef83b50fc4a4 -r 23febc32fc1b tools/libxc/xc_domain.c
--- a/tools/libxc/xc_domain.c Wed Dec 12 10:29:35 2007 +0000
+++ b/tools/libxc/xc_domain.c Wed Dec 12 10:38:14 2007 +0000
@@ -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 -r ef83b50fc4a4 -r 23febc32fc1b xen/arch/x86/domctl.c
--- a/xen/arch/x86/domctl.c Wed Dec 12 10:29:35 2007 +0000
+++ b/xen/arch/x86/domctl.c Wed Dec 12 10:38:14 2007 +0000
@@ -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) )
         {

_______________________________________________
Xen-changelog mailing list
[hidden email]
http://lists.xensource.com/xen-changelog