From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 20 Jul 2012 12:34:50 +0000 (+0100)
Subject: hw/arm_boot.c: Check for RAM sizes exceeding ATAGS capacity
X-Git-Tag: v1.2.0-rc0~144^2~6
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3871481c0a3f64f25563a5a246c188acdc01ee49;p=qemu.git

hw/arm_boot.c: Check for RAM sizes exceeding ATAGS capacity

The legacy ATAGS format for passing information to the kernel only
allows RAM sizes which fit in 32 bits; enforce this restriction
rather than silently doing something weird.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---

diff --git a/hw/arm_boot.c b/hw/arm_boot.c
index 29ae324f9..af71ed6c3 100644
--- a/hw/arm_boot.c
+++ b/hw/arm_boot.c
@@ -399,6 +399,12 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info)
             bootloader[5] = dtb_start;
         } else {
             bootloader[5] = info->loader_start + KERNEL_ARGS_ADDR;
+            if (info->ram_size >= (1ULL << 32)) {
+                fprintf(stderr, "qemu: RAM size must be less than 4GB to boot"
+                        " Linux kernel using ATAGS (try passing a device tree"
+                        " using -dtb)\n");
+                exit(1);
+            }
         }
         bootloader[6] = entry;
         for (n = 0; n < sizeof(bootloader) / 4; n++) {