From: Alexander Graf <agraf@suse.de>
Date: Fri, 20 May 2011 15:33:28 +0000 (+0200)
Subject: s390x: complain when allocating ram fails
X-Git-Tag: v0.15.0-rc0~256^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb8b273579eaa1e6cee4017e4b23104e17a36f07;p=thirdparty%2Fqemu.git

s390x: complain when allocating ram fails

While trying out the > 64GB guest RAM patch, I hit some virtual address
limitations of my host system, which resulted in mmap failing. Unfortunately,
qemu didn't tell me about this failure, but just used the NULL pointer
happily, resulting in either segmentation faults or other fun errors.

To spare other users from tracing this down, let's print a nice message
instead so the user can figure out what's wrong from there.

Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/exec.c b/exec.c
index 3f96d441014..a4785b25f8f 100644
--- a/exec.c
+++ b/exec.c
@@ -2918,6 +2918,10 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name,
             new_block->host = mmap((void*)0x800000000, size,
                                    PROT_EXEC|PROT_READ|PROT_WRITE,
                                    MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
+            if (new_block->host == MAP_FAILED) {
+                fprintf(stderr, "Allocating RAM failed\n");
+                abort();
+            }
 #else
             if (xen_mapcache_enabled()) {
                 xen_ram_alloc(new_block->offset, size);