diff options
| author | Jiang Lu <lu.jiang@windriver.com> | 2014-03-28 17:42:44 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-01 23:37:01 +0100 |
| commit | 3d456fcb7f111c9350c512b71b26f05bd9821e0a (patch) | |
| tree | 59316e6f452f0903c0be0660c5c7b5fb99a4cad0 /meta/recipes-devtools/qemu/files | |
| parent | 3008b12d41c8c16032a9ae15af4ff53bc511aabc (diff) | |
| download | poky-3d456fcb7f111c9350c512b71b26f05bd9821e0a.tar.gz | |
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.
(From OE-Core rev: 48ff812a4b649fa7b1c73740ef65e4855640dc39)
Signed-off-by: Jiang Lu <lu.jiang@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.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 | 40 |
1 files changed, 40 insertions, 0 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 new file mode 100644 index 0000000000..3834aed6d0 --- /dev/null +++ b/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch | |||
| @@ -0,0 +1,40 @@ | |||
| 1 | From 896fa02c24347e6e9259812cfda187b1d6ca6199 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jiang Lu <lu.jiang@windriver.com> | ||
| 3 | Date: Wed, 13 Nov 2013 10:38:08 +0800 | ||
| 4 | Subject: [PATCH] Qemu:Arm:versatilepb: Add memory size checking | ||
| 5 | |||
| 6 | The machine can not work with memory over 256M, so add a checking | ||
| 7 | at startup. If the memory size exceed 256M, just stop emulation then | ||
| 8 | throw out warning about memory limitation. | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | |||
| 12 | Signed-off-by: Jiang Lu <lu.jiang@windriver.com> | ||
| 13 | |||
| 14 | Updated it on 2014-01-15 for rebasing | ||
| 15 | |||
| 16 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
| 17 | --- | ||
| 18 | hw/arm/versatilepb.c | 6 ++++++ | ||
| 19 | 1 file changed, 6 insertions(+) | ||
| 20 | |||
| 21 | diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c | ||
| 22 | index b48d84c..ad2cd5a 100644 | ||
| 23 | --- a/hw/arm/versatilepb.c | ||
| 24 | +++ b/hw/arm/versatilepb.c | ||
| 25 | @@ -199,6 +199,12 @@ static void versatile_init(QEMUMachineInitArgs *args, int board_id) | ||
| 26 | fprintf(stderr, "Unable to find CPU definition\n"); | ||
| 27 | exit(1); | ||
| 28 | } | ||
| 29 | + if (ram_size > (256 << 20)) { | ||
| 30 | + fprintf(stderr, | ||
| 31 | + "qemu: Too much memory for this machine: %d MB, maximum 256 MB\n", | ||
| 32 | + ((unsigned int)ram_size / (1 << 20))); | ||
| 33 | + exit(1); | ||
| 34 | + } | ||
| 35 | memory_region_init_ram(ram, NULL, "versatile.ram", args->ram_size); | ||
| 36 | vmstate_register_ram_global(ram); | ||
| 37 | /* ??? RAM should repeat to fill physical memory space. */ | ||
| 38 | -- | ||
| 39 | 1.7.10.4 | ||
| 40 | |||
