diff options
| -rw-r--r-- | HACKING | 2 | ||||
| -rw-r--r-- | coroutine-gthread.c | 2 | ||||
| -rw-r--r-- | ui/cocoa.m | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/HACKING b/HACKING index 5b4ae10654..733eab2dac 100644 --- a/HACKING +++ b/HACKING @@ -80,7 +80,7 @@ APIs is not allowed in the QEMU codebase. Instead of these routines, use the replacement g_malloc/g_malloc0/g_realloc/g_free or qemu_vmalloc/qemu_memalign/qemu_vfree APIs. -Please note that NULL check for the qemu_malloc result is redundant and +Please note that NULL check for the g_malloc result is redundant and that g_malloc() call with zero size is not allowed. Memory allocated by qemu_vmalloc or qemu_memalign must be freed with diff --git a/coroutine-gthread.c b/coroutine-gthread.c index b00e548b2d..fdea27a106 100644 --- a/coroutine-gthread.c +++ b/coroutine-gthread.c @@ -117,7 +117,7 @@ Coroutine *qemu_coroutine_self(void) if (!co) { co = g_malloc0(sizeof(*co)); co->runnable = true; - g_static_private_set(&coroutine_key, co, (GDestroyNotify)qemu_free); + g_static_private_set(&coroutine_key, co, (GDestroyNotify)g_free); } return &co->base; diff --git a/ui/cocoa.m b/ui/cocoa.m index 515e684dd2..d9e4e3dcaa 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -1004,15 +1004,15 @@ static void cocoa_refresh(DisplayState *ds) static void cocoa_cleanup(void) { COCOA_DEBUG("qemu_cocoa: cocoa_cleanup\n"); - qemu_free(dcl); + g_free(dcl); } void cocoa_display_init(DisplayState *ds, int full_screen) { COCOA_DEBUG("qemu_cocoa: cocoa_display_init\n"); - dcl = qemu_mallocz(sizeof(DisplayChangeListener)); - + dcl = g_malloc0(sizeof(DisplayChangeListener)); + // register vga output callbacks dcl->dpy_update = cocoa_update; dcl->dpy_resize = cocoa_resize; |