oom_check qemu_memalign
PATCH RESEND 1/1 oom_check qemu_memalign
As suggested by Avi on the KVM list, this patch adds oom_check to qemu_memalign, in the interests of symmetry with qemu_malloc*.
See also:
http://article.gmane.org/gmane.comp.emulators.kvm.devel/29510
This version also updates the win32 version, at malc's request.
Signed-off-by Nolan Leake <nolan <at> sigbus.net>
osdep.c +5 -4
@@ -51,7 +51,8 @@#if defined(_WIN32)void *qemu_memalign (size_t alignment,size_t size) { -return VirtualAlloc (NULL , size,MEM_COMMIT ,PAGE_READWRITE ); +return qemu_oom_check (VirtualAlloc (NULL , size, +MEM_COMMIT ,PAGE_READWRITE )); }void *qemu_vmalloc (size_t size)
@@ -186,11 +187,11 @@ ret =posix_memalign (&ptr, alignment, size);if (ret !=0 )return NULL ; -return ptr; +return qemu_oom_check (ptr);#elif defined(HOST_BSD ) -return valloc (size); +return qemu_oom_check (valloc (size));#else -return memalign (alignment, size); +return qemu_oom_check (memalign (alignment, size));#endif }
qemu-common.h +1 -0
@@ -126,6 +126,7 @@#define qemu_isascii (c) isascii((unsigned char)(c))#define qemu_toascii (c) toascii((unsigned char)(c)) +void *qemu_oom_check (void *ptr);void *qemu_malloc (size_t size);void *qemu_realloc (void *ptr,size_t size);void *qemu_mallocz (size_t size);
qemu-malloc.c +3 -3
@@ -24,7 +24,7 @@#include "qemu-common.h" #include <stdlib.h> -static void *oom_check (void *ptr) +void *qemu_oom_check (void *ptr) {if (ptr ==NULL )abort ();
@@ -43,13 +43,13 @@void *qemu_malloc (size_t size) { -return oom_check (malloc (size)); +return qemu_oom_check (malloc (size)); }void *qemu_realloc (void *ptr,size_t size) {if (size) -return oom_check (realloc (ptr, size)); +return qemu_oom_check (realloc (ptr, size));else return realloc (ptr, size); }