david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390/ipl: Fix error path on BIOS loading

Browse Source 
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>
This commit is contained in:
Christian Borntraeger 2014-03-14 13:38:57 +01:00
parent 087edb503a
commit 0a1bec8a4e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/s390x/ipl.c
View File

@ -80,7 +80,7 @@ static int s390_ipl_init(SysBusDevice *dev)
bios_size = load_elf(bios_filename, NULL, NULL, &ipl->start_addr, NULL, bios_size = load_elf(bios_filename, NULL, NULL, &ipl->start_addr, NULL,
NULL, 1, ELF_MACHINE, 0); NULL, 1, ELF_MACHINE, 0);
if (bios_size == -1) { if (bios_size < 0) {
bios_size = load_image_targphys(bios_filename, ZIPL_IMAGE_START, bios_size = load_image_targphys(bios_filename, ZIPL_IMAGE_START,
4096); 4096);
ipl->start_addr = ZIPL_IMAGE_START; ipl->start_addr = ZIPL_IMAGE_START;