diff options
| author |   Cristian Iorga <cristian.iorga@intel.com> | 2015-05-06 18:21:46 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-07 13:14:38 +0100 |
| commit | b88e3808533a7280c85e570a1359efcba8dcc4bd (patch) | |
| tree | c7fd4ac52f2848a18de114b21c022a8490f0d4fd /meta/recipes-devtools/qemu/files | |
| parent | 5de08f4bfa84534083b771f449a5584f0528a90a (diff) | |
| download | openembedded-core-contrib-b88e3808533a7280c85e570a1359efcba8dcc4bd.tar.gz | |
qemu: upgrade to 2.3.0
Qemu-Arm-versatilepb-Add-memory-size-checking.patch
brought up to date;
37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch removed,
integrated upstream;
glx enable config option changed to opengl enable,
update accordingly.
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/files')
| -rw-r--r-- | meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch | 22 |
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 |