motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 15:53:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

pc-bios/s390-ccw: Do not bail out early if not finding a SCSI disk

Browse source 
In case the user did not specify a boot device, we want to continue
looking for other devices if there are no valid SCSI disks on a virtio-
scsi controller. As a first step, do not panic in this case and let
the control flow carry the error to the upper functions instead.

Message-Id: <20200806105349.632-6-thuth@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2020-07-28 14:30:14 +02:00
parent d2cf4af1f4
commit 605751b5a5
5 changed files with 37 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pc-bios/s390-ccw/virtio-blkdev.c
View file

@ -263,9 +263,10 @@ uint64_t virtio_get_blocks(void)
return 0;
}
void virtio_blk_setup_device(SubChannelId schid)
int virtio_blk_setup_device(SubChannelId schid)
{
VDev *vdev = virtio_get_device();
int ret = 0;
vdev->schid = schid;
virtio_setup_ccw(vdev);
@ -288,9 +289,11 @@ void virtio_blk_setup_device(SubChannelId schid)
"Config: CDB size mismatch");
sclp_print("Using virtio-scsi.\n");
virtio_scsi_setup(vdev);
ret = virtio_scsi_setup(vdev);
break;
default:
panic("\n! No IPL device available !\n");
}
return ret;
}