aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch')
-rw-r--r--meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch22
1 files changed, 12 insertions, 10 deletions
diff --git a/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch b/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch
index b0c2ea5be9..1a6cf5119b 100644
--- a/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch
+++ b/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch
@@ -18,27 +18,29 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Update it when upgrade qemu to 2.2.0
Signed-off-by: Kai Kang <kai.kang@windriver.com>
+Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
- hw/arm/versatilepb.c | 6 ++++++
- 1 file changed, 6 insertions(+)
+ hw/arm/versatilepb.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
-index b48d84c..ad2cd5a 100644
+index 6c69f4e..9278d90 100644
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
-@@ -198,6 +198,12 @@ static void versatile_init(MachineState *machine, int board_id)
- fprintf(stderr, "Unable to find CPU definition\n");
+@@ -204,6 +204,13 @@ static void versatile_init(MachineState *machine, int board_id)
exit(1);
}
-+ if (ram_size > (256 << 20)) {
+
++ if (machine->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);
+ }
- memory_region_init_ram(ram, NULL, "versatile.ram", machine->ram_size,
- &error_abort);
- vmstate_register_ram_global(ram);
++
+ cpuobj = object_new(object_class_get_name(cpu_oc));
+
+ /* By default ARM1176 CPUs have EL3 enabled. This board does not
--
-1.7.10.4
+2.1.0