diff options
| author | Thomas Huth <thuth@redhat.com> | 2020-07-28 18:14:50 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2020-10-06 19:36:50 +0200 |
| commit | 5dc739f343cd06ecb9b058294564ce7504856f3f (patch) | |
| tree | bedcbf8891dac6398b3b9e16f2684d68093cb1d2 /pc-bios/s390-ccw/main.c | |
| parent | 869d0e2f593dd37297c366203f006b9acd1b7b45 (diff) | |
| download | qemu-5dc739f343cd06ecb9b058294564ce7504856f3f.zip qemu-5dc739f343cd06ecb9b058294564ce7504856f3f.tar.gz qemu-5dc739f343cd06ecb9b058294564ce7504856f3f.tar.bz2 | |
pc-bios/s390-ccw: Allow booting in case the first virtio-blk disk is bad
If you try to boot with two virtio-blk disks (without bootindex), and
only the second one is bootable, the s390-ccw bios currently stops at
the first disk and does not continue booting from the second one. This
is annoying - and all other major QEMU firmwares succeed to boot from
the second disk in this case, so we should do the same in the s390-ccw
bios, too.
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20200806105349.632-8-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'pc-bios/s390-ccw/main.c')
| -rw-r--r-- | pc-bios/s390-ccw/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index 9b58107..fc17e6a 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -240,7 +240,7 @@ static void ipl_boot_device(void) break; case CU_TYPE_VIRTIO: if (virtio_setup() == 0) { - zipl_load(); /* no return */ + zipl_load(); /* Only returns in case of errors */ } break; default: |