[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] oom_check qemu_memalign
From: |
Nolan |
Subject: |
[Qemu-devel] [PATCH] oom_check qemu_memalign |
Date: |
Thu, 19 Mar 2009 17:20:43 -0700 |
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
Signed-off-by: Nolan Leake <nolan <at> sigbus.net>
Index: qemu-malloc.c
===================================================================
--- qemu-malloc.c (revision 6858)
+++ qemu-malloc.c (working copy)
@@ -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);
}
Index: qemu-common.h
===================================================================
--- qemu-common.h (revision 6858)
+++ qemu-common.h (working copy)
@@ -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);
Index: osdep.c
===================================================================
--- osdep.c (revision 6858)
+++ osdep.c (working copy)
@@ -186,11 +186,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-devel] [PATCH] oom_check qemu_memalign,
Nolan <=