summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorChristian Borntraeger <borntraeger@de.ibm.com>2014-03-14 13:38:57 +0100
committerChristian Borntraeger <borntraeger@de.ibm.com>2014-03-17 22:01:19 +0100
commit0a1bec8a4e1c55bb581521c60db30e3f4867ceb1 (patch)
tree85f61c5753757bf8aaecd1af4b57885e9b900d19 /hw
parent087edb503afebf184f07078900efc26c73035e98 (diff)
downloadhqemu-0a1bec8a4e1c55bb581521c60db30e3f4867ceb1.zip
hqemu-0a1bec8a4e1c55bb581521c60db30e3f4867ceb1.tar.gz
s390/ipl: Fix error path on BIOS loading
commit 18674b26788a9e47f1157170234e32ece2044367 (elf-loader: add more return codes) enabled the elf loader to return other errors than -1. Lets also handle that case for our "BIOS" on s390. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> CC: Alexey Kardashevskiy <aik@ozlabs.ru> CC: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw')
-rw-r--r--hw/s390x/ipl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 32d38a0..4fa9cff 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -80,7 +80,7 @@ static int s390_ipl_init(SysBusDevice *dev)
bios_size = load_elf(bios_filename, NULL, NULL, &ipl->start_addr, NULL,
NULL, 1, ELF_MACHINE, 0);
- if (bios_size == -1) {
+ if (bios_size < 0) {
bios_size = load_image_targphys(bios_filename, ZIPL_IMAGE_START,
4096);
ipl->start_addr = ZIPL_IMAGE_START;
OpenPOWER on IntegriCloud