aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-24 15:07:25 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-24 15:07:25 +0000
commit0ccff151b42a5b684ce22473b68972a94bc708fb (patch)
tree850ffa2363ba6fd7d1e53bdb9c5881654896c00e
parentfc2e7aa3f17e1230f57eec6a0f54091262d08e48 (diff)
downloadqemu-0ccff151b42a5b684ce22473b68972a94bc708fb.zip
qemu-0ccff151b42a5b684ce22473b68972a94bc708fb.tar.gz
qemu-0ccff151b42a5b684ce22473b68972a94bc708fb.tar.bz2
mips: limit RAM size to 256MB on malta and qemu boards
This avoid crash when a bigger RAM size is requested (the devices are mapped at 0x01000000). Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6419 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--hw/mips_malta.c6
-rw-r--r--hw/mips_r4k.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 9a41cdf..ba67947 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -802,6 +802,12 @@ void mips_malta_init (ram_addr_t ram_size, int vga_ram_size,
qemu_register_reset(main_cpu_reset, env);
/* allocate RAM */
+ if (ram_size > (256 << 20)) {
+ fprintf(stderr,
+ "qemu: Too much memory for this machine: %d MB, maximum 256 MB\n",
+ ((unsigned int)ram_size / (1 << 20)));
+ exit(1);
+ }
cpu_register_physical_memory(0, ram_size, IO_MEM_RAM);
/* Map the bios at two physical locations, as on the real board. */
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 34b3853..1ed123e 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -178,6 +178,12 @@ void mips_r4k_init (ram_addr_t ram_size, int vga_ram_size,
qemu_register_reset(main_cpu_reset, env);
/* allocate RAM */
+ if (ram_size > (256 << 20)) {
+ fprintf(stderr,
+ "qemu: Too much memory for this machine: %d MB, maximum 256 MB\n",
+ ((unsigned int)ram_size / (1 << 20)));
+ exit(1);
+ }
cpu_register_physical_memory(0, ram_size, IO_MEM_RAM);
if (!mips_qemu_iomemtype) {