s390/ipl: Fix error path on BIOS loading
authorChristian Borntraeger <borntraeger@de.ibm.com>
Fri, 14 Mar 2014 12:38:57 +0000 (13:38 +0100)
committerChristian Borntraeger <borntraeger@de.ibm.com>
Mon, 17 Mar 2014 21:01:19 +0000 (22:01 +0100)
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>
hw/s390x/ipl.c

index 32d38a08f6ce1f43a0199eb0dde98746f6a9fb5f..4fa9cffdedbd98a84ee0395c2ca87e9cfba839dd 100644 (file)
@@ -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;