aboutsummaryrefslogtreecommitdiff
path: root/exec.c
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2008-11-11 22:06:42 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2008-11-11 22:06:42 +0000
commitc2b48b69cb80170b749b4252f7eb78acbb370879 (patch)
tree1b43a549fce56e08c57b32cceb91aa6db704860b /exec.c
parent6f7af85d98417936f4d5e324f1a6a2ba60fe2528 (diff)
downloadqemu-c2b48b69cb80170b749b4252f7eb78acbb370879.zip
qemu-c2b48b69cb80170b749b4252f7eb78acbb370879.tar.gz
qemu-c2b48b69cb80170b749b4252f7eb78acbb370879.tar.bz2
Fix -linux-user build by reverting r5701
Unfortunately, -linux-user doesn't use osdep as it replaces some of those functions with specific ones. The code #ifdef code in exec.c needs to remain in place so instead of introducing a qemu_getpagesize() let's just use getpagesize() in the non-Windows implementation of qemu_vmalloc. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5703 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'exec.c')
-rw-r--r--exec.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/exec.c b/exec.c
index 6285b3d..1edc737 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)