From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NY4Wn-0006xl-9d for qemu-devel@nongnu.org; Thu, 21 Jan 2010 16:25:21 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NY4Wi-0006rf-EF for qemu-devel@nongnu.org; Thu, 21 Jan 2010 16:25:20 -0500 Received: from [199.232.76.173] (port=41652 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NY4Wi-0006rQ-5k for qemu-devel@nongnu.org; Thu, 21 Jan 2010 16:25:16 -0500 Received: from moutng.kundenserver.de ([212.227.126.187]:55257) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NY4Wh-0004QI-IE for qemu-devel@nongnu.org; Thu, 21 Jan 2010 16:25:15 -0500 From: Stefan Weil Date: Thu, 21 Jan 2010 22:24:58 +0100 Message-Id: <1264109098-14373-1-git-send-email-weil@mail.berlios.de> In-Reply-To: References: Subject: [Qemu-devel] [PATCH] Tell users about out-of-memory errors List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers , av1474@comtv.ru 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 --- osdep.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/osdep.c b/osdep.c index 1310684..9b47066 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)); -- 1.6.5