diff options
| author | Peter Maydell | 2015-09-18 15:41:53 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-09-18 15:41:53 +0200 |
| commit | ffa4822c015d5670ef6a2239f3cbd2ff2cec57de (patch) | |
| tree | daef772c57a4e47fffbcd5ff1b03cee338d63220 /memory.c | |
| parent | Merge remote-tracking branch 'remotes/lalrae/tags/mips-20150918' into staging (diff) | |
| parent | memory: Fix bad error handling in memory_region_init_ram_ptr() (diff) | |
| download | qemu-ffa4822c015d5670ef6a2239f3cbd2ff2cec57de.tar.gz qemu-ffa4822c015d5670ef6a2239f3cbd2ff2cec57de.tar.xz qemu-ffa4822c015d5670ef6a2239f3cbd2ff2cec57de.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-09-18' into staging
Error reporting patches
# gpg: Signature made Fri 18 Sep 2015 13:42:49 BST using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
* remotes/armbru/tags/pull-error-2015-09-18:
memory: Fix bad error handling in memory_region_init_ram_ptr()
loader: Fix memory_region_init_resizeable_ram() error handling
Fix bad error handling after memory_region_init_ram()
error: New error_fatal
MAINTAINERS: Add "Error reporting" entry
error: Copy location information in error_copy()
hmp: Allow for error message hints on HMP
error: only prepend timestamp on stderr
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'memory.c')
| -rw-r--r-- | memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1251,7 +1251,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, /* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL. */ assert(ptr != NULL); - mr->ram_addr = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); + mr->ram_addr = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_fatal); } void memory_region_set_skip_dump(MemoryRegion *mr) |