diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-09-18 14:41:53 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-18 14:41:53 +0100 |
| commit | ffa4822c015d5670ef6a2239f3cbd2ff2cec57de (patch) | |
| tree | daef772c57a4e47fffbcd5ff1b03cee338d63220 /hw/pci-host/prep.c | |
| parent | 3bf1f5ec6a7ec8ee06c95bf308d213ebaa129ee0 (diff) | |
| parent | 0bdaa3a429c6d07cd437b442a1f15f70be1addaa (diff) | |
| download | hqemu-ffa4822c015d5670ef6a2239f3cbd2ff2cec57de.zip hqemu-ffa4822c015d5670ef6a2239f3cbd2ff2cec57de.tar.gz | |
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 'hw/pci-host/prep.c')
| -rw-r--r-- | hw/pci-host/prep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 988907b..da88cb3 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -302,7 +302,7 @@ static void raven_realize(PCIDevice *d, Error **errp) d->config[0x34] = 0x00; // capabilities_pointer memory_region_init_ram(&s->bios, OBJECT(s), "bios", BIOS_SIZE, - &error_abort); + &error_fatal); memory_region_set_readonly(&s->bios, true); memory_region_add_subregion(get_system_memory(), (uint32_t)(-BIOS_SIZE), &s->bios); |
