[Xen-changelog] [xen-unstable] libxc: osdep: convert xc_gnttab_set_max_grants()

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1291369007 0
# Node ID 36b2cef7eb9c38bb8b2f82027a6cd1b1f1deb56e
# Parent  0d76a4dbba7fb59e0d974aae58f1c4ad95bdada9
libxc: osdep: convert xc_gnttab_set_max_grants()

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Signed-off-by: Ian Jackson <ian.jackson.citrix.com>
---
 tools/libxc/xc_gnttab.c    |    4 ++++
 tools/libxc/xc_linux.c     |    8 +++++---
 tools/libxc/xc_minios.c    |    6 ++++--
 tools/libxc/xenctrlosdep.h |    1 +
 4 files changed, 14 insertions(+), 5 deletions(-)

diff -r 0d76a4dbba7f -r 36b2cef7eb9c tools/libxc/xc_gnttab.c
--- a/tools/libxc/xc_gnttab.c   Fri Dec 03 09:36:47 2010 +0000
+++ b/tools/libxc/xc_gnttab.c   Fri Dec 03 09:36:47 2010 +0000
@@ -182,6 +182,10 @@ int xc_gnttab_munmap(xc_gnttab *xcg,
                                         start_address, count);
 }
 
+int xc_gnttab_set_max_grants(xc_gnttab *xcg, uint32_t count)
+{
+       return xcg->ops->u.gnttab.set_max_grants(xcg, xcg->ops_handle, count);
+}
 
 /*
  * Local variables:
diff -r 0d76a4dbba7f -r 36b2cef7eb9c tools/libxc/xc_linux.c
--- a/tools/libxc/xc_linux.c    Fri Dec 03 09:36:47 2010 +0000
+++ b/tools/libxc/xc_linux.c    Fri Dec 03 09:36:47 2010 +0000
@@ -653,13 +653,14 @@ static int linux_gnttab_munmap(xc_gnttab
     return 0;
 }
 
-int xc_gnttab_set_max_grants(xc_gnttab *xcg, uint32_t count)
-{
+static int linux_gnttab_set_max_grants(xc_gnttab *xcg, xc_osdep_handle h, 
uint32_t count)
+{
+    int fd = (int)h;
     struct ioctl_gntdev_set_max_grants set_max;
     int rc;
 
     set_max.count = count;
-    if ( (rc = ioctl(xcg->fd, IOCTL_GNTDEV_SET_MAX_GRANTS, &set_max)) )
+    if ( (rc = ioctl(fd, IOCTL_GNTDEV_SET_MAX_GRANTS, &set_max)) )
         return rc;
 
     return 0;
@@ -674,6 +675,7 @@ static struct xc_osdep_ops linux_gnttab_
         .map_grant_refs = &linux_gnttab_map_grant_refs,
         .map_domain_grant_refs = &linux_gnttab_map_domain_grant_refs,
         .munmap = &linux_gnttab_munmap,
+        .set_max_grants = &linux_gnttab_set_max_grants,
     },
 };
 
diff -r 0d76a4dbba7f -r 36b2cef7eb9c tools/libxc/xc_minios.c
--- a/tools/libxc/xc_minios.c   Fri Dec 03 09:36:47 2010 +0000
+++ b/tools/libxc/xc_minios.c   Fri Dec 03 09:36:47 2010 +0000
@@ -504,11 +504,12 @@ static int minios_gnttab_munmap(xc_gntta
     return ret;
 }
 
-int xc_gnttab_set_max_grants(xc_gnttab *xcg,
+static int minios_gnttab_set_max_grants(xc_gnttab *xcg, xc_osdep_handle h,
                              uint32_t count)
 {
+    int fd = (int)h;
     int ret;
-    ret = gntmap_set_max_grants(&files[xcg->fd].gntmap,
+    ret = gntmap_set_max_grants(&files[fd].gntmap,
                                 count);
     if (ret < 0) {
         errno = -ret;
@@ -526,6 +527,7 @@ static struct xc_osdep_ops minios_gnttab
         .map_grant_refs = &minios_gnttab_map_grant_refs,
         .map_domain_grant_refs = &minios_gnttab_map_domain_grant_refs,
         .munmap = &minios_gnttab_munmap,
+        .set_max_grants = &minios_gnttab_set_max_grants,
     },
 };
 
diff -r 0d76a4dbba7f -r 36b2cef7eb9c tools/libxc/xenctrlosdep.h
--- a/tools/libxc/xenctrlosdep.h        Fri Dec 03 09:36:47 2010 +0000
+++ b/tools/libxc/xenctrlosdep.h        Fri Dec 03 09:36:47 2010 +0000
@@ -107,6 +107,7 @@ struct xc_osdep_ops
             int (*munmap)(xc_gnttab *xcg, xc_osdep_handle h,
                           void *start_address,
                           uint32_t count);
+            int (*set_max_grants)(xc_gnttab *xcg, xc_osdep_handle h, uint32_t 
count);
         } gnttab;
     } u;
 };

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