direct-io.hg

changeset 12484:726960294d4b

[XEN] Fix build. Mercurial ate my changeset fixups. :-(
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Fri Nov 17 12:13:24 2006 +0000 (2006-11-17)
parents 781ea5017f18
children 58f28e00001e
files xen/common/grant_table.c xen/include/xen/iocap.h
line diff
     1.1 --- a/xen/common/grant_table.c	Fri Nov 17 10:48:34 2006 +0000
     1.2 +++ b/xen/common/grant_table.c	Fri Nov 17 12:13:24 2006 +0000
     1.3 @@ -994,7 +994,7 @@ do_grant_table_op(
     1.4          if ( unlikely(!guest_handle_okay(map, count)) )
     1.5              goto out;
     1.6          rc = -EPERM;
     1.7 -        if ( unlikely(!grant_flip_permitted(d)) )
     1.8 +        if ( unlikely(!grant_operation_permitted(d)) )
     1.9              goto out;
    1.10          rc = gnttab_map_grant_ref(map, count);
    1.11          break;
    1.12 @@ -1006,7 +1006,7 @@ do_grant_table_op(
    1.13          if ( unlikely(!guest_handle_okay(unmap, count)) )
    1.14              goto out;
    1.15          rc = -EPERM;
    1.16 -        if ( unlikely(!grant_flip_permitted(d)) )
    1.17 +        if ( unlikely(!grant_operation_permitted(d)) )
    1.18              goto out;
    1.19          rc = gnttab_unmap_grant_ref(unmap, count);
    1.20          break;
    1.21 @@ -1024,7 +1024,7 @@ do_grant_table_op(
    1.22          if ( unlikely(!guest_handle_okay(transfer, count)) )
    1.23              goto out;
    1.24          rc = -EPERM;
    1.25 -        if ( unlikely(!grant_flip_permitted(d)) )
    1.26 +        if ( unlikely(!grant_operation_permitted(d)) )
    1.27              goto out;
    1.28          rc = gnttab_transfer(transfer, count);
    1.29          break;
     2.1 --- a/xen/include/xen/iocap.h	Fri Nov 17 10:48:34 2006 +0000
     2.2 +++ b/xen/include/xen/iocap.h	Fri Nov 17 12:13:24 2006 +0000
     2.3 @@ -36,7 +36,7 @@
     2.4   * domains with no hardware-access privileges to perform grant map/transfer
     2.5   * operations.
     2.6   */
     2.7 -#define grant_operations_permitted(d)                   \
     2.8 +#define grant_operation_permitted(d)                    \
     2.9      (!rangeset_is_empty((d)->iomem_caps))
    2.10  
    2.11  #endif /* __XEN_IOCAP_H__ */