|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v3 3/4] libs/foreignmemory: Use XEN_PAGE_* definitions
These changes refine the changes in 0dbb4be7 which added a dependency to
xenctrl library. We use the XEN_PAGE_* definitions instead of the XC_PAGE_*
definitions and therefore we get rid of the unnecessary dependency.
Signed-off-by: Costin Lupu <costin.lupu@xxxxxxxxx>
---
tools/libs/foreignmemory/Makefile | 2 ++
tools/libs/foreignmemory/core.c | 2 +-
tools/libs/foreignmemory/freebsd.c | 10 +++++-----
tools/libs/foreignmemory/linux.c | 18 +++++++++---------
tools/libs/foreignmemory/minios.c | 10 +---------
tools/libs/foreignmemory/netbsd.c | 10 +++++-----
tools/libs/foreignmemory/private.h | 1 -
tools/libs/foreignmemory/solaris.c | 6 +++---
8 files changed, 26 insertions(+), 33 deletions(-)
diff --git a/tools/libs/foreignmemory/Makefile
b/tools/libs/foreignmemory/Makefile
index 0eb9a3a712..e3f417f5ca 100644
--- a/tools/libs/foreignmemory/Makefile
+++ b/tools/libs/foreignmemory/Makefile
@@ -11,4 +11,6 @@ SRCS-$(CONFIG_SunOS) += compat.c solaris.c
SRCS-$(CONFIG_NetBSD) += netbsd.c
SRCS-$(CONFIG_MiniOS) += minios.c
+CFLAGS += -D__XEN_TOOLS__
+
include $(XEN_ROOT)/tools/libs/libs.mk
diff --git a/tools/libs/foreignmemory/core.c b/tools/libs/foreignmemory/core.c
index 7edc6f0dbf..ad1ad9fc67 100644
--- a/tools/libs/foreignmemory/core.c
+++ b/tools/libs/foreignmemory/core.c
@@ -202,7 +202,7 @@ int xenforeignmemory_resource_size(
if ( rc )
return rc;
- *size = fres.nr_frames << XC_PAGE_SHIFT;
+ *size = fres.nr_frames << XEN_PAGE_SHIFT;
return 0;
}
diff --git a/tools/libs/foreignmemory/freebsd.c
b/tools/libs/foreignmemory/freebsd.c
index 2cf0fa1c38..9439c4ca6a 100644
--- a/tools/libs/foreignmemory/freebsd.c
+++ b/tools/libs/foreignmemory/freebsd.c
@@ -63,7 +63,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle
*fmem,
privcmd_mmapbatch_t ioctlx;
int rc;
- addr = mmap(addr, num << XC_PAGE_SHIFT, prot, flags | MAP_SHARED, fd, 0);
+ addr = mmap(addr, num << XEN_PAGE_SHIFT, prot, flags | MAP_SHARED, fd, 0);
if ( addr == MAP_FAILED )
return NULL;
@@ -78,7 +78,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle
*fmem,
{
int saved_errno = errno;
- (void)munmap(addr, num << XC_PAGE_SHIFT);
+ (void)munmap(addr, num << XEN_PAGE_SHIFT);
errno = saved_errno;
return NULL;
}
@@ -89,7 +89,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle
*fmem,
int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem,
void *addr, size_t num)
{
- return munmap(addr, num << XC_PAGE_SHIFT);
+ return munmap(addr, num << XEN_PAGE_SHIFT);
}
int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem,
@@ -101,7 +101,7 @@ int osdep_xenforeignmemory_restrict(xenforeignmemory_handle
*fmem,
int osdep_xenforeignmemory_unmap_resource(xenforeignmemory_handle *fmem,
xenforeignmemory_resource_handle *fres)
{
- return fres ? munmap(fres->addr, fres->nr_frames << XC_PAGE_SHIFT) : 0;
+ return fres ? munmap(fres->addr, fres->nr_frames << XEN_PAGE_SHIFT) : 0;
}
int osdep_xenforeignmemory_map_resource(xenforeignmemory_handle *fmem,
@@ -120,7 +120,7 @@ int
osdep_xenforeignmemory_map_resource(xenforeignmemory_handle *fmem,
/* Request for resource size. Skip mmap(). */
goto skip_mmap;
- fres->addr = mmap(fres->addr, fres->nr_frames << XC_PAGE_SHIFT,
+ fres->addr = mmap(fres->addr, fres->nr_frames << XEN_PAGE_SHIFT,
fres->prot, fres->flags | MAP_SHARED, fmem->fd, 0);
if ( fres->addr == MAP_FAILED )
return -1;
diff --git a/tools/libs/foreignmemory/linux.c b/tools/libs/foreignmemory/linux.c
index 9062117407..9dabf28cae 100644
--- a/tools/libs/foreignmemory/linux.c
+++ b/tools/libs/foreignmemory/linux.c
@@ -134,7 +134,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 + (i<<XC_PAGE_SHIFT);
+ ioctlx.addr = (unsigned long)addr + (i<<XEN_PAGE_SHIFT);
ioctlx.arr = arr + i;
ioctlx.err = err + i;
@@ -168,7 +168,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle
*fmem,
size_t i;
int rc;
- addr = mmap(addr, num << XC_PAGE_SHIFT, prot, flags | MAP_SHARED,
+ addr = mmap(addr, num << XEN_PAGE_SHIFT, prot, flags | MAP_SHARED,
fd, 0);
if ( addr == MAP_FAILED )
return NULL;
@@ -198,7 +198,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle
*fmem,
*/
privcmd_mmapbatch_t ioctlx;
xen_pfn_t *pfn;
- unsigned int pfn_arr_size = ROUNDUP((num * sizeof(*pfn)),
XC_PAGE_SHIFT);
+ unsigned int pfn_arr_size = ROUNDUP((num * sizeof(*pfn)),
XEN_PAGE_SHIFT);
int os_page_size = sysconf(_SC_PAGESIZE);
if ( pfn_arr_size <= os_page_size )
@@ -210,7 +210,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle
*fmem,
if ( pfn == MAP_FAILED )
{
PERROR("mmap of pfn array failed");
- (void)munmap(addr, num << XC_PAGE_SHIFT);
+ (void)munmap(addr, num << XEN_PAGE_SHIFT);
return NULL;
}
}
@@ -243,7 +243,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle
*fmem,
continue;
}
rc = map_foreign_batch_single(fd, dom, pfn + i,
- (unsigned long)addr + (i<<XC_PAGE_SHIFT));
+ (unsigned long)addr + (i<<XEN_PAGE_SHIFT));
if ( rc < 0 )
{
rc = -errno;
@@ -271,7 +271,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle
*fmem,
{
int saved_errno = errno;
- (void)munmap(addr, num << XC_PAGE_SHIFT);
+ (void)munmap(addr, num << XEN_PAGE_SHIFT);
errno = saved_errno;
return NULL;
}
@@ -282,7 +282,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle
*fmem,
int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem,
void *addr, size_t num)
{
- return munmap(addr, num << XC_PAGE_SHIFT);
+ return munmap(addr, num << XEN_PAGE_SHIFT);
}
int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem,
@@ -294,7 +294,7 @@ int osdep_xenforeignmemory_restrict(xenforeignmemory_handle
*fmem,
int osdep_xenforeignmemory_unmap_resource(
xenforeignmemory_handle *fmem, xenforeignmemory_resource_handle *fres)
{
- return fres ? munmap(fres->addr, fres->nr_frames << XC_PAGE_SHIFT) : 0;
+ return fres ? munmap(fres->addr, fres->nr_frames << XEN_PAGE_SHIFT) : 0;
}
int osdep_xenforeignmemory_map_resource(
@@ -313,7 +313,7 @@ int osdep_xenforeignmemory_map_resource(
/* Request for resource size. Skip mmap(). */
goto skip_mmap;
- fres->addr = mmap(fres->addr, fres->nr_frames << XC_PAGE_SHIFT,
+ fres->addr = mmap(fres->addr, fres->nr_frames << XEN_PAGE_SHIFT,
fres->prot, fres->flags | MAP_SHARED, fmem->fd, 0);
if ( fres->addr == MAP_FAILED )
return -1;
diff --git a/tools/libs/foreignmemory/minios.c
b/tools/libs/foreignmemory/minios.c
index f2f4dfb2be..2454eb9af3 100644
--- a/tools/libs/foreignmemory/minios.c
+++ b/tools/libs/foreignmemory/minios.c
@@ -17,14 +17,6 @@
* Copyright 2007-2008 Samuel Thibault <samuel.thibault@xxxxxxxxxxxxx>.
*/
-/*
- * xenctrl.h currently defines __XEN_TOOLS__ which affects what is
- * exposed by Xen headers. As the define needs to be set consistently,
- * we want to include xenctrl.h before the mini-os headers (they include
- * public headers).
- */
-#include <xenctrl.h>
-
#include <mini-os/types.h>
#include <mini-os/os.h>
#include <mini-os/mm.h>
@@ -63,7 +55,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle
*fmem,
int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem,
void *addr, size_t num)
{
- return munmap(addr, num << XC_PAGE_SHIFT);
+ return munmap(addr, num << XEN_PAGE_SHIFT);
}
/*
diff --git a/tools/libs/foreignmemory/netbsd.c
b/tools/libs/foreignmemory/netbsd.c
index 597db775d7..ba69b9c6bb 100644
--- a/tools/libs/foreignmemory/netbsd.c
+++ b/tools/libs/foreignmemory/netbsd.c
@@ -76,7 +76,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle
*fmem,
{
int fd = fmem->fd;
privcmd_mmapbatch_v2_t ioctlx;
- addr = mmap(addr, num * XC_PAGE_SIZE, prot,
+ addr = mmap(addr, num * XEN_PAGE_SIZE, prot,
flags | MAP_ANON | MAP_SHARED, -1, 0);
if ( addr == MAP_FAILED ) {
PERROR("osdep_xenforeignmemory_map: mmap failed");
@@ -93,7 +93,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle
*fmem,
{
int saved_errno = errno;
PERROR("osdep_xenforeignmemory_map: ioctl failed");
- munmap(addr, num * XC_PAGE_SIZE);
+ munmap(addr, num * XEN_PAGE_SIZE);
errno = saved_errno;
return NULL;
}
@@ -104,7 +104,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle
*fmem,
int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem,
void *addr, size_t num)
{
- return munmap(addr, num * XC_PAGE_SIZE);
+ return munmap(addr, num * XEN_PAGE_SIZE);
}
int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem,
@@ -117,7 +117,7 @@ int osdep_xenforeignmemory_restrict(xenforeignmemory_handle
*fmem,
int osdep_xenforeignmemory_unmap_resource(
xenforeignmemory_handle *fmem, xenforeignmemory_resource_handle *fres)
{
- return fres ? munmap(fres->addr, fres->nr_frames << XC_PAGE_SHIFT) : 0;
+ return fres ? munmap(fres->addr, fres->nr_frames << XEN_PAGE_SHIFT) : 0;
}
int osdep_xenforeignmemory_map_resource(
@@ -136,7 +136,7 @@ int osdep_xenforeignmemory_map_resource(
/* Request for resource size. Skip mmap(). */
goto skip_mmap;
- fres->addr = mmap(fres->addr, fres->nr_frames << XC_PAGE_SHIFT,
+ fres->addr = mmap(fres->addr, fres->nr_frames << XEN_PAGE_SHIFT,
fres->prot, fres->flags | MAP_ANON | MAP_SHARED, -1, 0);
if ( fres->addr == MAP_FAILED )
return -1;
diff --git a/tools/libs/foreignmemory/private.h
b/tools/libs/foreignmemory/private.h
index 8540303adc..48df948f90 100644
--- a/tools/libs/foreignmemory/private.h
+++ b/tools/libs/foreignmemory/private.h
@@ -1,7 +1,6 @@
#ifndef XENFOREIGNMEMORY_PRIVATE_H
#define XENFOREIGNMEMORY_PRIVATE_H
-#include <xenctrl.h>
#include <xentoollog.h>
#include <xenforeignmemory.h>
diff --git a/tools/libs/foreignmemory/solaris.c
b/tools/libs/foreignmemory/solaris.c
index 958fb01f6d..4466780bd8 100644
--- a/tools/libs/foreignmemory/solaris.c
+++ b/tools/libs/foreignmemory/solaris.c
@@ -72,7 +72,7 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem,
uint32_t dom,
{
int fd = fmem->fd;
privcmd_mmapbatch_t ioctlx;
- addr = mmap(addr, num*XC_PAGE_SIZE, prot, flags | MAP_SHARED, fd, 0);
+ addr = mmap(addr, num*XEN_PAGE_SIZE, prot, flags | MAP_SHARED, fd, 0);
if ( addr == MAP_FAILED )
return NULL;
@@ -84,7 +84,7 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem,
uint32_t dom,
{
int saved_errno = errno;
- (void)munmap(addr, num*XC_PAGE_SIZE);
+ (void)munmap(addr, num*XEN_PAGE_SIZE);
errno = saved_errno;
return NULL;
}
@@ -94,7 +94,7 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem,
uint32_t dom,
int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem,
void *addr, size_t num)
{
- return munmap(addr, num*XC_PAGE_SIZE);
+ return munmap(addr, num*XEN_PAGE_SIZE);
}
/*
--
2.20.1
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |