2014-03-28 09:42:44 +00:00
|
|
|
From 896fa02c24347e6e9259812cfda187b1d6ca6199 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jiang Lu <lu.jiang@windriver.com>
|
|
|
|
Date: Wed, 13 Nov 2013 10:38:08 +0800
|
|
|
|
Subject: [PATCH] Qemu:Arm:versatilepb: Add memory size checking
|
|
|
|
|
|
|
|
The machine can not work with memory over 256M, so add a checking
|
|
|
|
at startup. If the memory size exceed 256M, just stop emulation then
|
|
|
|
throw out warning about memory limitation.
|
|
|
|
|
|
|
|
Upstream-Status: Pending
|
|
|
|
|
|
|
|
Signed-off-by: Jiang Lu <lu.jiang@windriver.com>
|
|
|
|
|
|
|
|
Updated it on 2014-01-15 for rebasing
|
|
|
|
|
|
|
|
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
2014-12-18 01:36:40 +00:00
|
|
|
|
|
|
|
Update it when upgrade qemu to 2.2.0
|
|
|
|
|
|
|
|
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
2014-03-28 09:42:44 +00:00
|
|
|
---
|
|
|
|
hw/arm/versatilepb.c | 6 ++++++
|
|
|
|
1 file changed, 6 insertions(+)
|
|
|
|
|
|
|
|
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
|
|
|
|
index b48d84c..ad2cd5a 100644
|
|
|
|
--- a/hw/arm/versatilepb.c
|
|
|
|
+++ b/hw/arm/versatilepb.c
|
2014-12-18 01:36:40 +00:00
|
|
|
@@ -198,6 +198,12 @@ static void versatile_init(MachineState *machine, int board_id)
|
2014-03-28 09:42:44 +00:00
|
|
|
fprintf(stderr, "Unable to find CPU definition\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
+ 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);
|
|
|
|
+ }
|
2014-12-18 01:36:40 +00:00
|
|
|
memory_region_init_ram(ram, NULL, "versatile.ram", machine->ram_size,
|
|
|
|
&error_abort);
|
2014-03-28 09:42:44 +00:00
|
|
|
vmstate_register_ram_global(ram);
|
|
|
|
--
|
|
|
|
1.7.10.4
|
|
|
|
|