[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH XEN v5 15/23] foreignmemory: use size_t for size arguments.
Surprisingly it appears no callers need updating. Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx> Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx> --- v4: New patch --- tools/libs/foreignmemory/compat.c | 2 +- tools/libs/foreignmemory/freebsd.c | 4 ++-- .../libs/foreignmemory/include/xenforeignmemory.h | 4 ++-- tools/libs/foreignmemory/linux.c | 25 +++++++++++----------- tools/libs/foreignmemory/minios.c | 6 +++--- tools/libs/foreignmemory/netbsd.c | 2 +- tools/libs/foreignmemory/solaris.c | 2 +- 7 files changed, 23 insertions(+), 22 deletions(-) diff --git a/tools/libs/foreignmemory/compat.c b/tools/libs/foreignmemory/compat.c index df9702e..46c4b55 100644 --- a/tools/libs/foreignmemory/compat.c +++ b/tools/libs/foreignmemory/compat.c @@ -23,7 +23,7 @@ void *xc_map_foreign_bulk(xenforeignmem_handle *fmem, uint32_t dom, int prot, - const xen_pfn_t *arr, int *err, unsigned int num) + const xen_pfn_t *arr, int *err, size_t num) { xen_pfn_t *pfn; unsigned int i; diff --git a/tools/libs/foreignmemory/freebsd.c b/tools/libs/foreignmemory/freebsd.c index f9e74fa..0d71713 100644 --- a/tools/libs/foreignmemory/freebsd.c +++ b/tools/libs/foreignmemory/freebsd.c @@ -85,7 +85,7 @@ int osdep_xenforeignmemory_close(xenforeignmemory_handle *fmem) void *xenforeignmemory_map(xenforeignmemory_handle *fmem, uint32_t dom, int prot, const xen_pfn_t *arr, int *err, - unsigned int num) + size_t num) { int fd = fmem->fd; privcmd_mmapbatch_t ioctlx; @@ -119,7 +119,7 @@ void *xenforeignmemory_map(xenforeignmemory_handle *fmem, } int xenforeignmemory_unmap(xenforeignmemory_handle *fmem, - void *addr, unsigned int num) + void *addr, size_t num) { return munmap(addr, num << PAGE_SHIFT); } diff --git a/tools/libs/foreignmemory/include/xenforeignmemory.h b/tools/libs/foreignmemory/include/xenforeignmemory.h index 1bcdf6a..99ec883 100644 --- a/tools/libs/foreignmemory/include/xenforeignmemory.h +++ b/tools/libs/foreignmemory/include/xenforeignmemory.h @@ -56,10 +56,10 @@ int xenforeignmemory_close(xenforeignmemory_handle *xmem); */ void *xenforeignmemory_map(xenforeignmemory_handle *fmem, uint32_t dom, int prot, const xen_pfn_t *arr, int *err, - unsigned int num); + size_t pages); int xenforeignmemory_unmap(xenforeignmemory_handle *fmem, - void *addr, unsigned int num); + void *addr, size_t pages); #endif diff --git a/tools/libs/foreignmemory/linux.c b/tools/libs/foreignmemory/linux.c index 86a5a97..3c08679 100644 --- a/tools/libs/foreignmemory/linux.c +++ b/tools/libs/foreignmemory/linux.c @@ -109,10 +109,11 @@ static int map_foreign_batch_single(int fd, uint32_t dom, * This will keep the request ring full and avoids delays. */ static int retry_paged(int fd, uint32_t dom, void *addr, - const xen_pfn_t *arr, int *err, unsigned int num) + const xen_pfn_t *arr, int *err, size_t num) { privcmd_mmapbatch_v2_t ioctlx; - int rc, paged = 0, i = 0; + int rc, paged = 0; + size_t i = 0; do { @@ -128,7 +129,7 @@ static int retry_paged(int fd, uint32_t dom, void *addr, /* At least one gfn is still in paging state */ ioctlx.num = 1; ioctlx.dom = dom; - ioctlx.addr = (unsigned long)addr + ((unsigned long)i<<PAGE_SHIFT); + ioctlx.addr = (unsigned long)addr + (i<<PAGE_SHIFT); ioctlx.arr = arr + i; ioctlx.err = err + i; @@ -153,16 +154,16 @@ out: } void *xenforeignmemory_map(xenforeignmemory_handle *fmem, - uint32_t dom, int prot, - const xen_pfn_t *arr, int *err, unsigned int num) + uint32_t dom, int prot, + const xen_pfn_t *arr, int *err, size_t num) { int fd = fmem->fd; privcmd_mmapbatch_v2_t ioctlx; void *addr; - unsigned int i; + size_t i; int rc; - addr = mmap(NULL, (unsigned long)num << PAGE_SHIFT, prot, MAP_SHARED, + addr = mmap(NULL, num << PAGE_SHIFT, prot, MAP_SHARED, fd, 0); if ( addr == MAP_FAILED ) { @@ -206,7 +207,7 @@ void *xenforeignmemory_map(xenforeignmemory_handle *fmem, if ( pfn == MAP_FAILED ) { PERROR("mmap of pfn array failed"); - (void)munmap(addr, (unsigned long)num << PAGE_SHIFT); + (void)munmap(addr, num << PAGE_SHIFT); return NULL; } } @@ -239,7 +240,7 @@ void *xenforeignmemory_map(xenforeignmemory_handle *fmem, continue; } rc = map_foreign_batch_single(fd, dom, pfn + i, - (unsigned long)addr + ((unsigned long)i<<PAGE_SHIFT)); + (unsigned long)addr + (i<<PAGE_SHIFT)); if ( rc < 0 ) { rc = -errno; @@ -268,7 +269,7 @@ void *xenforeignmemory_map(xenforeignmemory_handle *fmem, int saved_errno = errno; PERROR("ioctl failed"); - (void)munmap(addr, (unsigned long)num << PAGE_SHIFT); + (void)munmap(addr, num << PAGE_SHIFT); errno = saved_errno; return NULL; } @@ -277,9 +278,9 @@ void *xenforeignmemory_map(xenforeignmemory_handle *fmem, } int xenforeignmemory_unmap(xenforeignmemory_handle *fmem, - void *addr, unsigned int num) + void *addr, size_t num) { - return munmap(addr, (unsigned long)num << PAGE_SHIFT); + return munmap(addr, num << PAGE_SHIFT); } /* diff --git a/tools/libs/foreignmemory/minios.c b/tools/libs/foreignmemory/minios.c index dbb152f..3d3c711 100644 --- a/tools/libs/foreignmemory/minios.c +++ b/tools/libs/foreignmemory/minios.c @@ -40,8 +40,8 @@ int osdep_xenforeignmemory_close(xenforeignmemory_handle *fmem) } void *xenforeignmemory_map(xenforeignmemory_handle *fmem, - uint32_t dom, int prot, - const xen_pfn_t *arr, int *err, unsigned int num) + uint32_t dom, int prot, + const xen_pfn_t *arr, int *err, size_t num) { unsigned long pt_prot = 0; if (prot & PROT_READ) @@ -52,7 +52,7 @@ void *xenforeignmemory_map(xenforeignmemory_handle *fmem, } int xenforeignmemory_unmap(xenforeignmemory_handle *fmem, - void *addr, unsigned int num) + void *addr, size_t num) { return munmap(addr, num << PAGE_SHIFT); } diff --git a/tools/libs/foreignmemory/netbsd.c b/tools/libs/foreignmemory/netbsd.c index 4d68b52..747d5b4 100644 --- a/tools/libs/foreignmemory/netbsd.c +++ b/tools/libs/foreignmemory/netbsd.c @@ -95,7 +95,7 @@ void *compat_mapforeign_batch(xenforeignmem_handle *fmem, uint32_t dom, } int xenforeignmemory_unmap(xenforeignmemory_handle *fmem, - void *addr, unsigned int num) + void *addr, size_t num) { return munmap(addr, num*XC_PAGE_SIZE); } diff --git a/tools/libs/foreignmemory/solaris.c b/tools/libs/foreignmemory/solaris.c index 3f8e705..359e664 100644 --- a/tools/libs/foreignmemory/solaris.c +++ b/tools/libs/foreignmemory/solaris.c @@ -94,7 +94,7 @@ void *compat_mapforeign_batch(xenforeignmem_handle *fmem, uint32_t dom, } int xenforeignmemory_unmap(xenforeignmemory_handle *fmem, - void *addr, unsigned int num) + void *addr, size_t num) { return munmap(addr, num*XC_PAGE_SIZE); } -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |