[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/6] Terminate emulation on memory allocation failur
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 1/6] Terminate emulation on memory allocation failure |
Date: |
Thu, 5 Feb 2009 13:08:41 +0200 |
Memory allocation failures are a very rare condition on virtual-memory
hosts. They are also very difficult to handle correctly (especially in a
hardware emulation context). Because of this, it is better to gracefully
terminate emulation rather than executing untested or even unwritten recovery
code paths.
This patch changes the qemu memory allocation routines to terminate emulation
if an allocation failure is encountered.
Signed-off-by: Avi Kivity <address@hidden>
---
qemu-malloc.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/qemu-malloc.c b/qemu-malloc.c
index dc74efe..1d00f26 100644
--- a/qemu-malloc.c
+++ b/qemu-malloc.c
@@ -22,6 +22,14 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
+#include <stdlib.h>
+
+static void *oom_check(void *ptr)
+{
+ if (ptr == NULL)
+ exit(13);
+ return ptr;
+}
void *get_mmap_addr(unsigned long size)
{
@@ -35,20 +43,18 @@ void qemu_free(void *ptr)
void *qemu_malloc(size_t size)
{
- return malloc(size);
+ return oom_check(malloc(size));
}
void *qemu_realloc(void *ptr, size_t size)
{
- return realloc(ptr, size);
+ return oom_check(realloc(ptr, size));
}
void *qemu_mallocz(size_t size)
{
void *ptr;
ptr = qemu_malloc(size);
- if (!ptr)
- return NULL;
memset(ptr, 0, size);
return ptr;
}
@@ -58,8 +64,6 @@ char *qemu_strdup(const char *str)
char *ptr;
size_t len = strlen(str);
ptr = qemu_malloc(len + 1);
- if (!ptr)
- return NULL;
memcpy(ptr, str, len + 1);
return ptr;
}
--
1.6.1.1
- [Qemu-devel] [PATCH 0/6] Unify memory allocation failure handling, Avi Kivity, 2009/02/05
- [Qemu-devel] [PATCH 3/6] audio: remove error handling from qemu_malloc() callers, Avi Kivity, 2009/02/05
- [Qemu-devel] [PATCH 6/6] toplevel: remove error handling from qemu_malloc() callers, Avi Kivity, 2009/02/05
- [Qemu-devel] [PATCH 4/6] hw: remove error handling from qemu_malloc() callers, Avi Kivity, 2009/02/05
- Re: [Qemu-devel] [PATCH 0/6] Unify memory allocation failure handling, Ian Jackson, 2009/02/05
- [Qemu-devel] Re: [PATCH 0/6] Unify memory allocation failure handling, Anthony Liguori, 2009/02/05