motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 20:33:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use glib memory allocation and free functions

Browse source 
qemu_malloc/qemu_free no longer exist after this commit.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2011-08-20 22:09:37 -05:00
parent 14015304b6
commit 7267c0947d
357 changed files with 1672 additions and 1674 deletions
Download patch file Download diff file Expand all files Collapse all files

16
bsd-user/mmap.c
View file

@ -94,7 +94,7 @@ void *qemu_vmalloc(size_t size)
return p;
}
void *qemu_malloc(size_t size)
void *g_malloc(size_t size)
{
char * p;
size += 16;
@ -104,12 +104,12 @@ void *qemu_malloc(size_t size)
}
/* We use map, which is always zero initialized. */
void * qemu_mallocz(size_t size)
void * g_malloc0(size_t size)
{
return qemu_malloc(size);
return g_malloc(size);
}
void qemu_free(void *ptr)
void g_free(void *ptr)
{
/* FIXME: We should unmark the reserved pages here. However this gets
complicated when one target page spans multiple host pages, so we
@ -119,18 +119,18 @@ void qemu_free(void *ptr)
munmap(p, *p);
}
void *qemu_realloc(void *ptr, size_t size)
void *g_realloc(void *ptr, size_t size)
{
size_t old_size, copy;
void *new_ptr;
if (!ptr)
return qemu_malloc(size);
return g_malloc(size);
old_size = *(size_t *)((char *)ptr - 16);
copy = old_size < size ? old_size : size;
new_ptr = qemu_malloc(size);
new_ptr = g_malloc(size);
memcpy(new_ptr, ptr, copy);
qemu_free(ptr);
g_free(ptr);
return new_ptr;
}

4
bsd-user/syscall.c
View file

@ -231,7 +231,7 @@ static abi_long do_freebsd_sysctl(abi_ulong namep, int32_t namelen, abi_ulong ol
void *hnamep, *holdp, *hnewp = NULL;
size_t holdlen;
abi_ulong oldlen = 0;
int32_t *snamep = qemu_malloc(sizeof(int32_t) * namelen), *p, *q, i;
int32_t *snamep = g_malloc(sizeof(int32_t) * namelen), *p, *q, i;
uint32_t kind = 0;
if (oldlenp)
@ -255,7 +255,7 @@ static abi_long do_freebsd_sysctl(abi_ulong namep, int32_t namelen, abi_ulong ol
unlock_user(holdp, oldp, holdlen);
if (hnewp)
unlock_user(hnewp, newp, 0);
qemu_free(snamep);
g_free(snamep);
return ret;
}
#endif