From d2d5adcb58d32e8ac6c168c4c2e72cf0f90dcab0 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 21 Jan 2010 22:24:58 +0100 Subject: Tell users about out-of-memory errors Aborting without an error message when memory is short is not helpful, so print the reason for the abort. Try qemu -m 1000000 or qemu -m 2000 (win32) to force an out-of-memory error. v2: * Fix error message for win32. * Fix error message for posix_memalign. Thanks to malc for the hints. Signed-off-by: Stefan Weil Signed-off-by: Anthony Liguori --- osdep.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/osdep.c b/osdep.c index 09fbc992e3..cf3a2c620a 100644 --- a/osdep.c +++ b/osdep.c @@ -52,6 +52,11 @@ 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; @@ -91,8 +96,11 @@ void *qemu_memalign(size_t alignment, size_t size) int ret; void *ptr; ret = posix_memalign(&ptr, alignment, size); - if (ret != 0) + if (ret != 0) { + fprintf(stderr, "Failed to allocate %zu B: %s\n", + size, strerror(ret)); abort(); + } return ptr; #elif defined(CONFIG_BSD) return oom_check(valloc(size)); -- cgit v1.2.3