From: Jes Sorensen <jes.soren...@redhat.com> This consolidates the duplicated oom_check() functions, as well as splitting them into OS dependant versions to avoid the #ifdef grossness that was present in the old osdep.c version.
Signed-off-by: Jes Sorensen <jes.soren...@redhat.com> --- os-posix-lib.c | 13 +++++++++++-- os-win32-lib.c | 13 +++++++++++-- osdep.c | 15 --------------- qemu-common.h | 1 + qemu-malloc.c | 14 +++----------- 5 files changed, 26 insertions(+), 30 deletions(-) diff --git a/os-posix-lib.c b/os-posix-lib.c index 773e998..cb146dd 100644 --- a/os-posix-lib.c +++ b/os-posix-lib.c @@ -33,6 +33,15 @@ #include "qemu-options.h" #include "qemu_socket.h" +void *qemu_oom_check(void *ptr) +{ + if (ptr == NULL) { + fprintf(stderr, "Failed to allocate memory: %s\n", strerror(errno)); + abort(); + } + return ptr; +} + void *qemu_memalign(size_t alignment, size_t size) { void *ptr; @@ -45,9 +54,9 @@ void *qemu_memalign(size_t alignment, size_t size) abort(); } #elif defined(CONFIG_BSD) - ptr = oom_check(valloc(size)); + ptr = qemu_oom_check(valloc(size)); #else - ptr = oom_check(memalign(alignment, size)); + ptr = qemu_oom_check(memalign(alignment, size)); #endif trace_qemu_memalign(alignment, size, ptr); return ptr; diff --git a/os-win32-lib.c b/os-win32-lib.c index b5b6def..a1c7ca8 100644 --- a/os-win32-lib.c +++ b/os-win32-lib.c @@ -38,6 +38,15 @@ #include "qemu-options.h" #include "qemu_socket.h" +void *qemu_oom_check(void *ptr) +{ + if (ptr == NULL) { + fprintf(stderr, "Failed to allocate memory: %lu\n", GetLastError()); + abort(); + } + return ptr; +} + void *qemu_memalign(size_t alignment, size_t size) { void *ptr; @@ -45,7 +54,7 @@ void *qemu_memalign(size_t alignment, size_t size) if (!size) { abort(); } - ptr = oom_check(VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE)); + ptr = qemu_oom_check(VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE)); trace_qemu_memalign(alignment, size, ptr); return ptr; } @@ -60,7 +69,7 @@ void *qemu_vmalloc(size_t size) if (!size) { abort(); } - ptr = oom_check(VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE)); + ptr = qemu_oom_check(VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE)); trace_qemu_vmalloc(size, ptr); return ptr; } diff --git a/osdep.c b/osdep.c index 702c9d9..0d48561 100644 --- a/osdep.c +++ b/osdep.c @@ -57,21 +57,6 @@ extern int madvise(caddr_t, size_t, int); #include "sysemu.h" #include "qemu_socket.h" -#if !defined(_POSIX_C_SOURCE) || defined(_WIN32) || defined(__sun__) -static void *oom_check(void *ptr) -{ - if (ptr == NULL) { -#if defined(_WIN32) - fprintf(stderr, "Failed to allocate memory: %lu\n", GetLastError()); -#else - fprintf(stderr, "Failed to allocate memory: %s\n", strerror(errno)); -#endif - abort(); - } - return ptr; -} -#endif - int qemu_madvise(void *addr, size_t len, int advice) { if (advice == QEMU_MADV_INVALID) { diff --git a/qemu-common.h b/qemu-common.h index 81aafa0..ead1d83 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -174,6 +174,7 @@ const char *path(const char *pathname); #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); diff --git a/qemu-malloc.c b/qemu-malloc.c index ecffb67..28fb05a 100644 --- a/qemu-malloc.c +++ b/qemu-malloc.c @@ -25,14 +25,6 @@ #include "trace.h" #include <stdlib.h> -static void *oom_check(void *ptr) -{ - if (ptr == NULL) { - abort(); - } - return ptr; -} - void qemu_free(void *ptr) { trace_qemu_free(ptr); @@ -54,7 +46,7 @@ void *qemu_malloc(size_t size) if (!size && !allow_zero_malloc()) { abort(); } - ptr = oom_check(malloc(size ? size : 1)); + ptr = qemu_oom_check(malloc(size ? size : 1)); trace_qemu_malloc(size, ptr); return ptr; } @@ -65,7 +57,7 @@ void *qemu_realloc(void *ptr, size_t size) if (!size && !allow_zero_malloc()) { abort(); } - newptr = oom_check(realloc(ptr, size ? size : 1)); + newptr = qemu_oom_check(realloc(ptr, size ? size : 1)); trace_qemu_realloc(ptr, size, newptr); return newptr; } @@ -75,7 +67,7 @@ void *qemu_mallocz(size_t size) if (!size && !allow_zero_malloc()) { abort(); } - return oom_check(calloc(1, size ? size : 1)); + return qemu_oom_check(calloc(1, size ? size : 1)); } char *qemu_strdup(const char *str) -- 1.7.2.3