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
This commit is contained in:
aliguori 2008-11-11 22:06:42 +00:00
parent 6f7af85d98
commit c2b48b69cb
3 changed files with 11 additions and 16 deletions

11
exec.c
View File

@ -231,7 +231,16 @@ static void page_init(void)
{ {
/* NOTE: we can always suppose that qemu_host_page_size >= /* NOTE: we can always suppose that qemu_host_page_size >=
TARGET_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) if (qemu_host_page_size == 0)
qemu_host_page_size = qemu_real_host_page_size; qemu_host_page_size = qemu_real_host_page_size;
if (qemu_host_page_size < TARGET_PAGE_SIZE) if (qemu_host_page_size < TARGET_PAGE_SIZE)

15
osdep.c
View File

@ -66,14 +66,6 @@ void qemu_vfree(void *ptr)
VirtualFree(ptr, 0, MEM_RELEASE); VirtualFree(ptr, 0, MEM_RELEASE);
} }
long qemu_getpagesize(void)
{
SYSTEM_INFO system_info;
GetSystemInfo(&system_info);
return system_info.dwPageSize;
}
#else #else
#if defined(USE_KQEMU) #if defined(USE_KQEMU)
@ -198,11 +190,6 @@ void *qemu_memalign(size_t alignment, size_t size)
#endif #endif
} }
long qemu_getpagesize(void)
{
return sysconf(_SC_PAGESIZE);
}
/* alloc shared memory pages */ /* alloc shared memory pages */
void *qemu_vmalloc(size_t size) void *qemu_vmalloc(size_t size)
{ {
@ -213,7 +200,7 @@ void *qemu_vmalloc(size_t size)
#ifdef _BSD #ifdef _BSD
return valloc(size); return valloc(size);
#else #else
return memalign(qemu_getpagesize(), size); return memalign(getpagesize(), size);
#endif #endif
} }

View File

@ -72,7 +72,6 @@
void *qemu_memalign(size_t alignment, size_t size); void *qemu_memalign(size_t alignment, size_t size);
void *qemu_vmalloc(size_t size); void *qemu_vmalloc(size_t size);
void qemu_vfree(void *ptr); void qemu_vfree(void *ptr);
long qemu_getpagesize(void);
int qemu_create_pidfile(const char *filename); int qemu_create_pidfile(const char *filename);