[Qemu-devel] [5701] Define OS-dependent qemu_getpagesize() (Hollis Blanchard)

[Qemu-devel] [5701] Define OS-dependent qemu_getpagesize() (Hollis Blanchard)

[Anthony Liguori]

Revision: 5701
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5701
Author:   aliguori
Date:     2008-11-11 21:48:59 +0000 (Tue, 11 Nov 2008)

Log Message:
-----------
Define OS-dependent qemu_getpagesize() (Hollis Blanchard)

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

Modified Paths:
--------------
    trunk/exec.c
    trunk/osdep.c
    trunk/osdep.h

Modified: trunk/exec.c
===================================================================
--- trunk/exec.c	2008-11-11 21:33:36 UTC (rev 5700)
+++ trunk/exec.c	2008-11-11 21:48:59 UTC (rev 5701)
@@ -231,16 +231,7 @@
 {
     /* NOTE: we can always suppose that qemu_host_page_size >=
        TARGET_PAGE_SIZE */
-#ifdef _WIN32
-    {
-        SYSTEM_INFO system_info;
-
-        GetSystemInfo(&system_info);
-        qemu_real_host_page_size = system_info.dwPageSize;
-    }
-#else
-    qemu_real_host_page_size = getpagesize();
-#endif
+    qemu_real_host_page_size = qemu_getpagesize();
     if (qemu_host_page_size == 0)
         qemu_host_page_size = qemu_real_host_page_size;
     if (qemu_host_page_size < TARGET_PAGE_SIZE)

Modified: trunk/osdep.c
===================================================================
--- trunk/osdep.c	2008-11-11 21:33:36 UTC (rev 5700)
+++ trunk/osdep.c	2008-11-11 21:48:59 UTC (rev 5701)
@@ -66,6 +66,14 @@
     VirtualFree(ptr, 0, MEM_RELEASE);
 }
 
+long qemu_getpagesize(void)
+{
+    SYSTEM_INFO system_info;
+
+    GetSystemInfo(&system_info);
+    return system_info.dwPageSize;
+}
+
 #else
 
 #if defined(USE_KQEMU)
@@ -190,6 +198,11 @@
 #endif
 }
 
+long qemu_getpagesize(void)
+{
+    return sysconf(_SC_PAGESIZE);
+}
+
 /* alloc shared memory pages */
 void *qemu_vmalloc(size_t size)
 {

Modified: trunk/osdep.h
===================================================================
--- trunk/osdep.h	2008-11-11 21:33:36 UTC (rev 5700)
+++ trunk/osdep.h	2008-11-11 21:48:59 UTC (rev 5701)
@@ -72,6 +72,7 @@
 void *qemu_memalign(size_t alignment, size_t size);
 void *qemu_vmalloc(size_t size);
 void qemu_vfree(void *ptr);
+long qemu_getpagesize(void);
 
 int qemu_create_pidfile(const char *filename);