ia64/xen-unstable

changeset 16596:23febc32fc1b

Fix build after I removed test_assign_device from domctl union.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Dec 12 10:38:14 2007 +0000 (2007-12-12)
parents ef83b50fc4a4
children 686b75b31f3c
files tools/libxc/xc_domain.c xen/arch/x86/domctl.c
line diff
     1.1 --- a/tools/libxc/xc_domain.c	Wed Dec 12 10:29:35 2007 +0000
     1.2 +++ b/tools/libxc/xc_domain.c	Wed Dec 12 10:38:14 2007 +0000
     1.3 @@ -772,7 +772,7 @@ int xc_test_assign_device(
     1.4  
     1.5      domctl.cmd = XEN_DOMCTL_test_assign_device;
     1.6      domctl.domain = domid;
     1.7 -    domctl.u.test_assign_device.machine_bdf = machine_bdf;
     1.8 +    domctl.u.assign_device.machine_bdf = machine_bdf;
     1.9  
    1.10      return do_domctl(xc_handle, &domctl);
    1.11  }
     2.1 --- a/xen/arch/x86/domctl.c	Wed Dec 12 10:29:35 2007 +0000
     2.2 +++ b/xen/arch/x86/domctl.c	Wed Dec 12 10:38:14 2007 +0000
     2.3 @@ -533,8 +533,8 @@ long arch_do_domctl(
     2.4          if ( !vtd_enabled )
     2.5              break;
     2.6  
     2.7 -        bus = (domctl->u.test_assign_device.machine_bdf >> 16) & 0xff;
     2.8 -        devfn = (domctl->u.test_assign_device.machine_bdf >> 8) & 0xff;
     2.9 +        bus = (domctl->u.assign_device.machine_bdf >> 16) & 0xff;
    2.10 +        devfn = (domctl->u.assign_device.machine_bdf >> 8) & 0xff;
    2.11  
    2.12          if ( device_assigned(bus, devfn) )
    2.13          {