commit d2d5adcb58d32e8ac6c168c4c2e72cf0f90dcab0
author Stefan Weil <weil@mail.berlios.de> Thu Jan 21 22:24:58 2010 +0100
committer Anthony Liguori <aliguori@us.ibm.com> Tue Jan 26 16:28:46 2010 -0600
tree 5306855552cd0570a0e08182aca6f7ec53e01dfd
parent 776e1bbb6cf4fe66a93c1a5dd814bbb650deca00

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 <weil@mail.berlios.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

osdep.c

diff --git a/osdep.c b/osdep.c
index 09fbc99..cf3a2c6 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 @@
     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));