OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

bsd-user: avoid conflict with qemu_vmalloc

Browse Source 
Rename qemu_vmalloc() to bsd_vmalloc(), adjust the only user.

Remove #ifdeffery in oslib-posix.c.

Tested-by: Andreas Färber <andreas.faerber@web.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2013-01-19 09:49:09 +00:00
parent 82cb6b041c
commit 0360ccffbe
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsd-user/mmap.c
View File

@ -74,7 +74,7 @@ void mmap_unlock(void)
}
#endif
void *qemu_vmalloc(size_t size)
static void *bsd_vmalloc(size_t size)
{
void *p;
mmap_lock();
@ -98,7 +98,7 @@ void *g_malloc(size_t size)
{
char * p;
size += 16;
p = qemu_vmalloc(size);
p = bsd_vmalloc(size);
*(size_t *)p = size;
return p + 16;
}

3
util/oslib-posix.c
View File

@ -105,8 +105,6 @@ void *qemu_memalign(size_t alignment, size_t size)
return ptr;
}
/* conflicts with qemu_vmalloc in bsd-user/mmap.c */
#if !defined(CONFIG_BSD_USER)
/* alloc shared memory pages */
void *qemu_vmalloc(size_t size)
{
@ -129,7 +127,6 @@ void *qemu_vmalloc(size_t size)
trace_qemu_vmalloc(size, ptr);
return ptr;
}
#endif
void qemu_vfree(void *ptr)
{