[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [5703] Fix -linux-user build by reverting r5701
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [5703] Fix -linux-user build by reverting r5701 |
Date: |
Tue, 11 Nov 2008 22:06:43 +0000 |
Revision: 5703
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5703
Author: aliguori
Date: 2008-11-11 22:06:42 +0000 (Tue, 11 Nov 2008)
Log Message:
-----------
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 <address@hidden>
Modified Paths:
--------------
trunk/exec.c
trunk/osdep.c
trunk/osdep.h
Modified: trunk/exec.c
===================================================================
--- trunk/exec.c 2008-11-11 21:50:17 UTC (rev 5702)
+++ trunk/exec.c 2008-11-11 22:06:42 UTC (rev 5703)
@@ -231,7 +231,16 @@
{
/* 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)
Modified: trunk/osdep.c
===================================================================
--- trunk/osdep.c 2008-11-11 21:50:17 UTC (rev 5702)
+++ trunk/osdep.c 2008-11-11 22:06:42 UTC (rev 5703)
@@ -66,14 +66,6 @@
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 @@
#endif
}
-long qemu_getpagesize(void)
-{
- return sysconf(_SC_PAGESIZE);
-}
-
/* alloc shared memory pages */
void *qemu_vmalloc(size_t size)
{
@@ -213,7 +200,7 @@
#ifdef _BSD
return valloc(size);
#else
- return memalign(qemu_getpagesize(), size);
+ return memalign(getpagesize(), size);
#endif
}
Modified: trunk/osdep.h
===================================================================
--- trunk/osdep.h 2008-11-11 21:50:17 UTC (rev 5702)
+++ trunk/osdep.h 2008-11-11 22:06:42 UTC (rev 5703)
@@ -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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [5703] Fix -linux-user build by reverting r5701,
Anthony Liguori <=