From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LQk6Z-0005Nx-MS
	for qemu-devel@nongnu.org; Sat, 24 Jan 2009 10:07:27 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LQk6Z-0005NZ-7u
	for qemu-devel@nongnu.org; Sat, 24 Jan 2009 10:07:27 -0500
Received: from [199.232.76.173] (port=39397 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LQk6Y-0005NW-Sc
	for qemu-devel@nongnu.org; Sat, 24 Jan 2009 10:07:26 -0500
Received: from savannah.gnu.org ([199.232.41.3]:49027 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LQk6Y-0004Dv-EL
	for qemu-devel@nongnu.org; Sat, 24 Jan 2009 10:07:26 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LQk6Y-0000Rn-1x
	for qemu-devel@nongnu.org; Sat, 24 Jan 2009 15:07:26 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aurel32@savannah.gnu.org>) id 1LQk6X-0000Rj-SA
	for qemu-devel@nongnu.org; Sat, 24 Jan 2009 15:07:25 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1LQk6X-0000Rj-SA@cvs.savannah.gnu.org>
Date: Sat, 24 Jan 2009 15:07:25 +0000
Subject: [Qemu-devel] [6419] mips: limit RAM size to 256MB on malta and qemu
	boards
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6419
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6419
Author:   aurel32
Date:     2009-01-24 15:07:25 +0000 (Sat, 24 Jan 2009)

Log Message:
-----------
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>

Modified Paths:
--------------
    trunk/hw/mips_malta.c
    trunk/hw/mips_r4k.c

Modified: trunk/hw/mips_malta.c
===================================================================
--- trunk/hw/mips_malta.c	2009-01-24 15:07:09 UTC (rev 6418)
+++ trunk/hw/mips_malta.c	2009-01-24 15:07:25 UTC (rev 6419)
@@ -802,6 +802,12 @@
     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. */

Modified: trunk/hw/mips_r4k.c
===================================================================
--- trunk/hw/mips_r4k.c	2009-01-24 15:07:09 UTC (rev 6418)
+++ trunk/hw/mips_r4k.c	2009-01-24 15:07:25 UTC (rev 6419)
@@ -178,6 +178,12 @@
     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) {