libxc: osdep: Use XC_PAGE_{SHIFT,MASK}.

Avoid dependency on xc_private.h

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Ian Jackson <ian.jackson.citrix.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/tools/libxc/xc_solaris.c b/tools/libxc/xc_solaris.c
index cb366d7254..981c272951 100644
--- a/tools/libxc/xc_solaris.c
+++ b/tools/libxc/xc_solaris.c
@@ -80,7 +80,7 @@ static void *solaris_privcmd_map_foreign_batch(xc_interface *xch, xc_osdep_handl
     int fd = (int)h;
     privcmd_mmapbatch_t ioctlx;
     void *addr;
-    addr = mmap(NULL, num*PAGE_SIZE, prot, MAP_SHARED, fd, 0);
+    addr = mmap(NULL, num*XC_PAGE_SIZE, prot, MAP_SHARED, fd, 0);
     if ( addr == MAP_FAILED )
         return NULL;
 
@@ -92,7 +92,7 @@ static void *solaris_privcmd_map_foreign_batch(xc_interface *xch, xc_osdep_handl
     {
         int saved_errno = errno;
         PERROR("XXXXXXXX");
-        (void)munmap(addr, num*PAGE_SIZE);
+        (void)munmap(addr, num*XC_PAGE_SIZE);
         errno = saved_errno;
         return NULL;
     }
@@ -118,7 +118,7 @@ static void *xc_map_foreign_range(xc_interface *xch, xc_osdep_handle h,
     ioctlx.entry=&entry;
     entry.va=(unsigned long) addr;
     entry.mfn=mfn;
-    entry.npages=(size+PAGE_SIZE-1)>>PAGE_SHIFT;
+    entry.npages=(size+XC_PAGE_SIZE-1)>>XC_PAGE_SHIFT;
     if ( ioctl(fd, IOCTL_PRIVCMD_MMAP, &ioctlx) < 0 )
     {
         int saved_errno = errno;
@@ -145,7 +145,7 @@ static void *solaric_privcmd_map_foreign_ranges(xc_interface *xch, xc_osdep_hand
 
     for (i = 0; i < nentries; i++) {
         entries[i].va = (uintptr_t)addr + (i * chunksize);
-        entries[i].npages = chunksize >> PAGE_SHIFT;
+        entries[i].npages = chunksize >> XC_PAGE_SHIFT;
     }
 
     ioctlx.num   = nentries;