|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v3 4/4] libs/gnttab: Use XEN_PAGE_* definitions
These changes refine the changes in d1b32abd 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/gnttab/Makefile | 2 ++
tools/libs/gnttab/freebsd.c | 19 +++++++++----------
tools/libs/gnttab/linux.c | 19 +++++++++----------
tools/libs/gnttab/netbsd.c | 19 +++++++++----------
4 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/tools/libs/gnttab/Makefile b/tools/libs/gnttab/Makefile
index ae390ce60f..a884860378 100644
--- a/tools/libs/gnttab/Makefile
+++ b/tools/libs/gnttab/Makefile
@@ -13,4 +13,6 @@ SRCS-$(CONFIG_FreeBSD) += $(SRCS-GNTTAB) $(SRCS-GNTSHR)
freebsd.c
SRCS-$(CONFIG_NetBSD) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) netbsd.c
SRCS-$(CONFIG_SunOS) += gnttab_unimp.c gntshr_unimp.c
+CFLAGS += -D__XEN_TOOLS__
+
include $(XEN_ROOT)/tools/libs/libs.mk
diff --git a/tools/libs/gnttab/freebsd.c b/tools/libs/gnttab/freebsd.c
index e42ac3fbf3..548e21361d 100644
--- a/tools/libs/gnttab/freebsd.c
+++ b/tools/libs/gnttab/freebsd.c
@@ -30,7 +30,6 @@
#include <xen/sys/gntdev.h>
-#include <xenctrl.h>
#include <xen-tools/libs.h>
#include "private.h"
@@ -74,7 +73,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt,
int domids_stride;
unsigned int refs_size = ROUNDUP(count *
sizeof(struct ioctl_gntdev_grant_ref),
- XC_PAGE_SHIFT);
+ XEN_PAGE_SHIFT);
int os_page_size = getpagesize();
domids_stride = (flags & XENGNTTAB_GRANT_MAP_SINGLE_DOMAIN) ? 0 : 1;
@@ -105,7 +104,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt,
goto out;
}
- addr = mmap(NULL, XC_PAGE_SIZE * count, prot, MAP_SHARED, fd,
+ addr = mmap(NULL, XEN_PAGE_SIZE * count, prot, MAP_SHARED, fd,
map.index);
if ( addr != MAP_FAILED )
{
@@ -114,7 +113,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt,
notify.index = map.index;
notify.action = 0;
- if ( notify_offset < XC_PAGE_SIZE * count )
+ if ( notify_offset < XEN_PAGE_SIZE * count )
{
notify.index += notify_offset;
notify.action |= UNMAP_NOTIFY_CLEAR_BYTE;
@@ -129,7 +128,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt,
if ( rv )
{
GTERROR(xgt->logger, "ioctl SET_UNMAP_NOTIFY failed");
- munmap(addr, count * XC_PAGE_SIZE);
+ munmap(addr, count * XEN_PAGE_SIZE);
addr = MAP_FAILED;
}
}
@@ -187,7 +186,7 @@ int osdep_gnttab_unmap(xengnttab_handle *xgt,
}
/* Next, unmap the memory. */
- if ( (rc = munmap(start_address, count * XC_PAGE_SIZE)) )
+ if ( (rc = munmap(start_address, count * XEN_PAGE_SIZE)) )
return rc;
/* Finally, unmap the driver slots used to store the grant information. */
@@ -254,7 +253,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,
goto out;
}
- area = mmap(NULL, count * XC_PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED,
+ area = mmap(NULL, count * XEN_PAGE_SIZE, PROT_READ | PROT_WRITE,
MAP_SHARED,
fd, gref_info.index);
if ( area == MAP_FAILED )
@@ -266,7 +265,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,
notify.index = gref_info.index;
notify.action = 0;
- if ( notify_offset < XC_PAGE_SIZE * count )
+ if ( notify_offset < XEN_PAGE_SIZE * count )
{
notify.index += notify_offset;
notify.action |= UNMAP_NOTIFY_CLEAR_BYTE;
@@ -281,7 +280,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,
if ( err )
{
GSERROR(xgs->logger, "ioctl SET_UNMAP_NOTIFY failed");
- munmap(area, count * XC_PAGE_SIZE);
+ munmap(area, count * XEN_PAGE_SIZE);
area = NULL;
}
@@ -304,7 +303,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,
int osdep_gntshr_unshare(xengntshr_handle *xgs,
void *start_address, uint32_t count)
{
- return munmap(start_address, count * XC_PAGE_SIZE);
+ return munmap(start_address, count * XEN_PAGE_SIZE);
}
/*
diff --git a/tools/libs/gnttab/linux.c b/tools/libs/gnttab/linux.c
index 5628fd5719..064aa3097f 100644
--- a/tools/libs/gnttab/linux.c
+++ b/tools/libs/gnttab/linux.c
@@ -32,7 +32,6 @@
#include <xen/sys/gntdev.h>
#include <xen/sys/gntalloc.h>
-#include <xenctrl.h>
#include <xen-tools/libs.h>
#include "private.h"
@@ -101,7 +100,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt,
map = alloca(map_size);
else
{
- map_size = ROUNDUP(map_size, XC_PAGE_SHIFT);
+ map_size = ROUNDUP(map_size, XEN_PAGE_SHIFT);
map = mmap(NULL, map_size, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANON | MAP_POPULATE, -1, 0);
if ( map == MAP_FAILED )
@@ -125,7 +124,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt,
}
retry:
- addr = mmap(NULL, XC_PAGE_SIZE * count, prot, MAP_SHARED, fd,
+ addr = mmap(NULL, XEN_PAGE_SIZE * count, prot, MAP_SHARED, fd,
map->index);
if (addr == MAP_FAILED && errno == EAGAIN)
@@ -150,7 +149,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt,
struct ioctl_gntdev_unmap_notify notify;
notify.index = map->index;
notify.action = 0;
- if (notify_offset < XC_PAGE_SIZE * count) {
+ if (notify_offset < XEN_PAGE_SIZE * count) {
notify.index += notify_offset;
notify.action |= UNMAP_NOTIFY_CLEAR_BYTE;
}
@@ -162,7 +161,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt,
rv = ioctl(fd, IOCTL_GNTDEV_SET_UNMAP_NOTIFY, ¬ify);
if (rv) {
GTERROR(xgt->logger, "ioctl SET_UNMAP_NOTIFY failed");
- munmap(addr, count * XC_PAGE_SIZE);
+ munmap(addr, count * XEN_PAGE_SIZE);
addr = MAP_FAILED;
}
}
@@ -218,7 +217,7 @@ int osdep_gnttab_unmap(xengnttab_handle *xgt,
}
/* Next, unmap the memory. */
- if ( (rc = munmap(start_address, count * XC_PAGE_SIZE)) )
+ if ( (rc = munmap(start_address, count * XEN_PAGE_SIZE)) )
return rc;
/* Finally, unmap the driver slots used to store the grant information. */
@@ -464,7 +463,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,
goto out;
}
- area = mmap(NULL, count * XC_PAGE_SIZE, PROT_READ | PROT_WRITE,
+ area = mmap(NULL, count * XEN_PAGE_SIZE, PROT_READ | PROT_WRITE,
MAP_SHARED, fd, gref_info->index);
if (area == MAP_FAILED) {
@@ -475,7 +474,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,
notify.index = gref_info->index;
notify.action = 0;
- if (notify_offset < XC_PAGE_SIZE * count) {
+ if (notify_offset < XEN_PAGE_SIZE * count) {
notify.index += notify_offset;
notify.action |= UNMAP_NOTIFY_CLEAR_BYTE;
}
@@ -487,7 +486,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,
err = ioctl(fd, IOCTL_GNTALLOC_SET_UNMAP_NOTIFY, ¬ify);
if (err) {
GSERROR(xgs->logger, "ioctl SET_UNMAP_NOTIFY failed");
- munmap(area, count * XC_PAGE_SIZE);
+ munmap(area, count * XEN_PAGE_SIZE);
area = NULL;
}
@@ -508,7 +507,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,
int osdep_gntshr_unshare(xengntshr_handle *xgs,
void *start_address, uint32_t count)
{
- return munmap(start_address, count * XC_PAGE_SIZE);
+ return munmap(start_address, count * XEN_PAGE_SIZE);
}
/*
diff --git a/tools/libs/gnttab/netbsd.c b/tools/libs/gnttab/netbsd.c
index a4ad624b54..b88dbcb49b 100644
--- a/tools/libs/gnttab/netbsd.c
+++ b/tools/libs/gnttab/netbsd.c
@@ -28,7 +28,6 @@
#include <sys/ioctl.h>
#include <sys/mman.h>
-#include <xenctrl.h>
#include <xen/xen.h>
#include <xen/xenio.h>
@@ -84,19 +83,19 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt,
}
map.count = count;
- addr = mmap(NULL, count * XC_PAGE_SIZE,
+ addr = mmap(NULL, count * XEN_PAGE_SIZE,
prot, flags | MAP_ANON | MAP_SHARED, -1, 0);
if ( map.va == MAP_FAILED )
{
GTERROR(xgt->logger, "osdep_gnttab_grant_map: mmap failed");
- munmap((void *)map.va, count * XC_PAGE_SIZE);
+ munmap((void *)map.va, count * XEN_PAGE_SIZE);
addr = MAP_FAILED;
}
map.va = addr;
map.notify.offset = 0;
map.notify.action = 0;
- if ( notify_offset < XC_PAGE_SIZE * count )
+ if ( notify_offset < XEN_PAGE_SIZE * count )
{
map.notify.offset = notify_offset;
map.notify.action |= UNMAP_NOTIFY_CLEAR_BYTE;
@@ -112,7 +111,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt,
{
GTERROR(xgt->logger,
"ioctl IOCTL_GNTDEV_MMAP_GRANT_REF failed: %d", rv);
- munmap(addr, count * XC_PAGE_SIZE);
+ munmap(addr, count * XEN_PAGE_SIZE);
addr = MAP_FAILED;
}
@@ -133,7 +132,7 @@ int osdep_gnttab_unmap(xengnttab_handle *xgt,
}
/* Next, unmap the memory. */
- rc = munmap(start_address, count * XC_PAGE_SIZE);
+ rc = munmap(start_address, count * XEN_PAGE_SIZE);
return rc;
}
@@ -184,7 +183,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,
alloc.domid = domid;
alloc.flags = writable ? GNTDEV_ALLOC_FLAG_WRITABLE : 0;
alloc.count = count;
- area = mmap(NULL, count * XC_PAGE_SIZE,
+ area = mmap(NULL, count * XEN_PAGE_SIZE,
PROT_READ | PROT_WRITE, MAP_ANON | MAP_SHARED, -1, 0);
if ( area == MAP_FAILED )
@@ -197,7 +196,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,
alloc.notify.offset = 0;
alloc.notify.action = 0;
- if ( notify_offset < XC_PAGE_SIZE * count )
+ if ( notify_offset < XEN_PAGE_SIZE * count )
{
alloc.notify.offset = notify_offset;
alloc.notify.action |= UNMAP_NOTIFY_CLEAR_BYTE;
@@ -212,7 +211,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,
if ( err )
{
GSERROR(xgs->logger, "IOCTL_GNTDEV_ALLOC_GRANT_REF failed");
- munmap(area, count * XC_PAGE_SIZE);
+ munmap(area, count * XEN_PAGE_SIZE);
area = MAP_FAILED;
goto out;
}
@@ -227,7 +226,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,
int osdep_gntshr_unshare(xengntshr_handle *xgs,
void *start_address, uint32_t count)
{
- return munmap(start_address, count * XC_PAGE_SIZE);
+ return munmap(start_address, count * XEN_PAGE_SIZE);
}
/*
--
2.20.1
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |