From b152aa84d52882bb1846485a89baf13aa07c86bc Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Tue, 26 Oct 2010 10:39:26 +0200 Subject: Consolidate oom_check() functions 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 Signed-off-by: Blue Swirl --- oslib-win32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'oslib-win32.c') diff --git a/oslib-win32.c b/oslib-win32.c index e03c47294d..ab29eae45c 100644 --- a/oslib-win32.c +++ b/oslib-win32.c @@ -31,7 +31,7 @@ #include "trace.h" #include "qemu_socket.h" -static void *oom_check(void *ptr) +void *qemu_oom_check(void *ptr) { if (ptr == NULL) { fprintf(stderr, "Failed to allocate memory: %lu\n", GetLastError()); @@ -47,7 +47,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; } @@ -62,7 +62,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; } -- cgit v1.2.3-55-g7522