summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--exec.c11
-rw-r--r--osdep.c15
-rw-r--r--osdep.h1
3 files changed, 11 insertions, 16 deletions
diff --git a/exec.c b/exec.c
index 6285b3d405..1edc737da5 100644
--- a/exec.c
+++ b/exec.c
@@ -231,7 +231,16 @@ static void page_init(void)
{
/* NOTE: we can always suppose that qemu_host_page_size >=
TARGET_PAGE_SIZE */
- qemu_real_host_page_size = qemu_getpagesize();
+#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
if (qemu_host_page_size == 0)
qemu_host_page_size = qemu_real_host_page_size;
if (qemu_host_page_size < TARGET_PAGE_SIZE)
diff --git a/osdep.c b/osdep.c
index 30a1263f06..d4db1e015b 100644
--- a/osdep.c
+++ b/osdep.c
@@ -66,14 +66,6 @@ void qemu_vfree(void *ptr)
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)
@@ -198,11 +190,6 @@ void *qemu_memalign(size_t alignment, size_t size)
#endif
}
-long qemu_getpagesize(void)
-{
- return sysconf(_SC_PAGESIZE);
-}
-
/* alloc shared memory pages */
void *qemu_vmalloc(size_t size)
{
@@ -213,7 +200,7 @@ void *qemu_vmalloc(size_t size)
#ifdef _BSD
return valloc(size);
#else
- return memalign(qemu_getpagesize(), size);
+ return memalign(getpagesize(), size);
#endif
}
diff --git a/osdep.h b/osdep.h
index e4022ba3c3..87f024b127 100644
--- a/osdep.h
+++ b/osdep.h
@@ -72,7 +72,6 @@
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);