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>

diff --git a/tools/libxc/xc_linux.c b/tools/libxc/xc_linux.c
index eafa7e1d56d5dc176173e5c07459538502fcd2cb..c199e7a339230a3f0084b3a0327ebcd77e1b4a44 100644 (file)
--- a/tools/libxc/xc_linux.c
+++ b/tools/libxc/xc_linux.c
@@ -110,7 +110,7 @@ static void *linux_privcmd_map_foreign_batch(xc_interface *xch, xc_osdep_handle
     void *addr;
     int rc;
 
-    addr = mmap(NULL, num << PAGE_SHIFT, prot, MAP_SHARED, fd, 0);
+    addr = mmap(NULL, num << XC_PAGE_SHIFT, prot, MAP_SHARED, fd, 0);
     if ( addr == MAP_FAILED )
     {
         PERROR("xc_map_foreign_batch: mmap failed");
@@ -132,7 +132,7 @@ static void *linux_privcmd_map_foreign_batch(xc_interface *xch, xc_osdep_handle
             if ( (arr[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) ==
                  XEN_DOMCTL_PFINFO_PAGEDTAB )
             {
-                unsigned long paged_addr = (unsigned long)addr + (i << PAGE_SHIFT);
+                unsigned long paged_addr = (unsigned long)addr + (i << XC_PAGE_SHIFT);
                 rc = xc_map_foreign_batch_single(fd, dom, &arr[i],
                                                  paged_addr);
                 if ( rc < 0 )
@@ -146,7 +146,7 @@ static void *linux_privcmd_map_foreign_batch(xc_interface *xch, xc_osdep_handle
     {
         int saved_errno = errno;
         PERROR("xc_map_foreign_batch: ioctl failed");
-        (void)munmap(addr, num << PAGE_SHIFT);
+        (void)munmap(addr, num << XC_PAGE_SHIFT);
         errno = saved_errno;
         return NULL;
     }
@@ -164,7 +164,7 @@ static void *linux_privcmd_map_foreign_bulk(xc_interface *xch, xc_osdep_handle h
     unsigned int i;
     int rc;
 
-    addr = mmap(NULL, (unsigned long)num << PAGE_SHIFT, prot, MAP_SHARED,
+    addr = mmap(NULL, (unsigned long)num << XC_PAGE_SHIFT, prot, MAP_SHARED,
                 fd, 0);
     if ( addr == MAP_FAILED )
     {
@@ -189,7 +189,7 @@ static void *linux_privcmd_map_foreign_bulk(xc_interface *xch, xc_osdep_handle h
 
             ioctlx.num = 1;
             ioctlx.dom = dom;
-            ioctlx.addr = (unsigned long)addr + ((unsigned long)i<<PAGE_SHIFT);
+            ioctlx.addr = (unsigned long)addr + ((unsigned long)i<<XC_PAGE_SHIFT);
             ioctlx.arr = arr + i;
             ioctlx.err = err + i;
             do {
@@ -239,7 +239,7 @@ static void *linux_privcmd_map_foreign_bulk(xc_interface *xch, xc_osdep_handle h
                         continue;
                     }
                     rc = xc_map_foreign_batch_single(fd, dom, pfn + i,
-                        (unsigned long)addr + ((unsigned long)i<<PAGE_SHIFT));
+                        (unsigned long)addr + ((unsigned long)i<<XC_PAGE_SHIFT));
                     if ( rc < 0 )
                     {
                         rc = -errno;
@@ -273,7 +273,7 @@ static void *linux_privcmd_map_foreign_bulk(xc_interface *xch, xc_osdep_handle h
         int saved_errno = errno;
 
         PERROR("xc_map_foreign_bulk: ioctl failed");
-        (void)munmap(addr, (unsigned long)num << PAGE_SHIFT);
+        (void)munmap(addr, (unsigned long)num << XC_PAGE_SHIFT);
         errno = saved_errno;
         return NULL;
     }
@@ -290,7 +290,7 @@ static void *linux_privcmd_map_foreign_range(xc_interface *xch, xc_osdep_handle
     int i;
     void *ret;
 
-    num = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
+    num = (size + XC_PAGE_SIZE - 1) >> XC_PAGE_SHIFT;
     arr = calloc(num, sizeof(xen_pfn_t));
 
     for ( i = 0; i < num; i++ )
@@ -313,7 +313,7 @@ static void *linux_privcmd_map_foreign_ranges(xc_interface *xch, xc_osdep_handle
     int j;
     void *ret;
 
-    num_per_entry = chunksize >> PAGE_SHIFT;
+    num_per_entry = chunksize >> XC_PAGE_SHIFT;
     num = num_per_entry * nentries;
     arr = calloc(num, sizeof(xen_pfn_t));
 
@@ -474,7 +474,7 @@ void discard_file_cache(xc_interface *xch, int fd, int flush)
     {
         if ( (cur = lseek(fd, 0, SEEK_CUR)) == (off_t)-1 )
             cur = 0;
-        cur &= ~(PAGE_SIZE-1);
+        cur &= ~(XC_PAGE_SIZE-1);
     }
 
     /* Discard from the buffer cache. */
@@ -521,7 +521,7 @@ static void *linux_gnttab_map_grant_ref(xc_gnttab *xch, xc_osdep_handle h,
     }
 
 mmap_again:    
-    addr = mmap(NULL, PAGE_SIZE, prot, MAP_SHARED, fd, map.index);
+    addr = mmap(NULL, XC_PAGE_SIZE, prot, MAP_SHARED, fd, map.index);
     if ( addr == MAP_FAILED )
     {
         int saved_errno = errno;
@@ -572,7 +572,7 @@ static void *do_gnttab_map_grant_refs(xc_gnttab *xch, xc_osdep_handle h,
         goto out;
     }
 
-    addr = mmap(NULL, PAGE_SIZE * count, prot, MAP_SHARED, fd,
+    addr = mmap(NULL, XC_PAGE_SIZE * count, prot, MAP_SHARED, fd,
                 map->index);
     if ( addr == MAP_FAILED )
     {

diff --git a/tools/libxc/xc_minios.c b/tools/libxc/xc_minios.c
index ee0468782a5608919282fb2d450e93e5a82e2792..db8d3b8810d24d05bbc604d21b2540793f9792ae 100644 (file)
--- a/tools/libxc/xc_minios.c
+++ b/tools/libxc/xc_minios.c
@@ -169,11 +169,11 @@ static void *minios_privcmd_map_foreign_ranges(xc_interface *xch, xc_osdep_handl
        pt_prot = L1_PROT;
 #endif
 
-    mfns = malloc((size / PAGE_SIZE) * sizeof(*mfns));
+    mfns = malloc((size / XC_PAGE_SIZE) * sizeof(*mfns));
 
     n = 0;
     for (i = 0; i < nentries; i++)
-        for (j = 0; j < chunksize / PAGE_SIZE; j++)
+        for (j = 0; j < chunksize / XC_PAGE_SIZE; j++)
             mfns[n++] = entries[i].mfn + j;
 
     ret = map_frames_ex(mfns, n, 1, 0, 1, dom, NULL, pt_prot);

diff --git a/tools/libxc/xc_netbsd.c b/tools/libxc/xc_netbsd.c
index e84b88b6ee7a564b27b77cb40357a53afe7c6873..117acedc676c7f9af60a9fe7eda5a827e91d3966 100644 (file)
--- a/tools/libxc/xc_netbsd.c
+++ b/tools/libxc/xc_netbsd.c
@@ -84,7 +84,7 @@ static void *netbsd_privcmd_map_foreign_batch(xc_interface *xch, xc_osdep_handle
     int fd = (int)h;
     privcmd_mmapbatch_t ioctlx;
     void *addr;
-    addr = mmap(NULL, num*PAGE_SIZE, prot, MAP_ANON | MAP_SHARED, -1, 0);
+    addr = mmap(NULL, num*XC_PAGE_SIZE, prot, MAP_ANON | MAP_SHARED, -1, 0);
     if ( addr == MAP_FAILED ) {
         PERROR("xc_map_foreign_batch: mmap failed");
         return NULL;
@@ -98,7 +98,7 @@ static void *netbsd_privcmd_map_foreign_batch(xc_interface *xch, xc_osdep_handle
     {
         int saved_errno = errno;
         PERROR("xc_map_foreign_batch: ioctl failed");
-        (void)munmap(addr, num*PAGE_SIZE);
+        (void)munmap(addr, num*XC_PAGE_SIZE);
         errno = saved_errno;
         return NULL;
     }
@@ -126,7 +126,7 @@ static void *netbsd_privcmd_map_foreign_range(xc_interface *xch, xc_osdep_handle
     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;
@@ -154,7 +154,7 @@ static void *netbsd_privcmd_map_foreign_ranges(xc_interface *xch, xc_osdep_handl
 
        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;

diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h
index 4d06b02d39b65b9c97ca06ef63297a4a4cca52bf..b01ca2419d0ec27c8c20b9fa46b136fe89018a84 100644 (file)
--- a/tools/libxc/xc_private.h
+++ b/tools/libxc/xc_private.h
@@ -53,8 +53,8 @@
 #undef PAGE_SIZE
 #undef PAGE_MASK
 #define PAGE_SHIFT              XC_PAGE_SHIFT
-#define PAGE_SIZE               (1UL << PAGE_SHIFT)
-#define PAGE_MASK               (~(PAGE_SIZE-1))
+#define PAGE_SIZE               XC_PAGE_SIZE
+#define PAGE_MASK               XC_PAGE_MASK
 
 /* Force a compilation error if condition is true */
 #define XC_BUILD_BUG_ON(p) ((void)sizeof(struct { int:-!!(p); }))

diff --git a/tools/libxc/xc_solaris.c b/tools/libxc/xc_solaris.c
index cb366d72542cdab3269256948bf42332c6a35a74..981c272951f31580137c2ec707ba133e457fc192 100644 (file)
--- 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;