WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] [XEN] Fix build. Mercurial ate my changes

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] [XEN] Fix build. Mercurial ate my changeset fixups. :-(
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Fri, 17 Nov 2006 13:50:20 +0000
Delivery-date: Fri, 17 Nov 2006 05:50:53 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 726960294d4bdc84a14a22164e368994ebe37bd2
# Parent  781ea5017f18ca99709f70a7ac9c99c1dec4d162
[XEN] Fix build. Mercurial ate my changeset fixups. :-(
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 xen/common/grant_table.c |    6 +++---
 xen/include/xen/iocap.h  |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff -r 781ea5017f18 -r 726960294d4b xen/common/grant_table.c
--- a/xen/common/grant_table.c  Fri Nov 17 10:48:34 2006 +0000
+++ b/xen/common/grant_table.c  Fri Nov 17 12:13:24 2006 +0000
@@ -994,7 +994,7 @@ do_grant_table_op(
         if ( unlikely(!guest_handle_okay(map, count)) )
             goto out;
         rc = -EPERM;
-        if ( unlikely(!grant_flip_permitted(d)) )
+        if ( unlikely(!grant_operation_permitted(d)) )
             goto out;
         rc = gnttab_map_grant_ref(map, count);
         break;
@@ -1006,7 +1006,7 @@ do_grant_table_op(
         if ( unlikely(!guest_handle_okay(unmap, count)) )
             goto out;
         rc = -EPERM;
-        if ( unlikely(!grant_flip_permitted(d)) )
+        if ( unlikely(!grant_operation_permitted(d)) )
             goto out;
         rc = gnttab_unmap_grant_ref(unmap, count);
         break;
@@ -1024,7 +1024,7 @@ do_grant_table_op(
         if ( unlikely(!guest_handle_okay(transfer, count)) )
             goto out;
         rc = -EPERM;
-        if ( unlikely(!grant_flip_permitted(d)) )
+        if ( unlikely(!grant_operation_permitted(d)) )
             goto out;
         rc = gnttab_transfer(transfer, count);
         break;
diff -r 781ea5017f18 -r 726960294d4b xen/include/xen/iocap.h
--- a/xen/include/xen/iocap.h   Fri Nov 17 10:48:34 2006 +0000
+++ b/xen/include/xen/iocap.h   Fri Nov 17 12:13:24 2006 +0000
@@ -36,7 +36,7 @@
  * domains with no hardware-access privileges to perform grant map/transfer
  * operations.
  */
-#define grant_operations_permitted(d)                   \
+#define grant_operation_permitted(d)                    \
     (!rangeset_is_empty((d)->iomem_caps))
 
 #endif /* __XEN_IOCAP_H__ */

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] [XEN] Fix build. Mercurial ate my changeset fixups. :-(, Xen patchbot-unstable <=