motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13: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

28
pc-bios/s390-ccw/virtio-scsi.c
View file

@ -194,7 +194,12 @@ static bool scsi_read_capacity(VDev *vdev,
/* virtio-scsi routines */
static void virtio_scsi_locate_device(VDev *vdev)
/*
* Tries to locate a SCSI device and and adds the information for the found
* device to the vdev->scsi_device structure.
* Returns 0 if SCSI device could be located, or a error code < 0 otherwise
*/
static int virtio_scsi_locate_device(VDev *vdev)
{
const uint16_t channel = 0; /* again, it's what QEMU does */
uint16_t target;
@ -220,7 +225,7 @@ static void virtio_scsi_locate_device(VDev *vdev)
IPL_check(sdev->channel == 0, "non-zero channel requested");
IPL_check(sdev->target <= vdev->config.scsi.max_target, "target# high");
IPL_check(sdev->lun <= vdev->config.scsi.max_lun, "LUN# high");
return;
return 0;
}
for (target = 0; target <= vdev->config.scsi.max_target; target++) {
@ -247,18 +252,20 @@ static void virtio_scsi_locate_device(VDev *vdev)
*/
sdev->lun = r->lun[0].v16[0]; /* it's returned this way */
debug_print_int("Have to use LUN", sdev->lun);
return; /* we have to use this device */
return 0; /* we have to use this device */
}
for (i = 0; i < luns; i++) {
if (r->lun[i].v64) {
/* Look for non-zero LUN - we have where to choose from */
sdev->lun = r->lun[i].v16[0];
debug_print_int("Will use LUN", sdev->lun);
return; /* we have found a device */
return 0; /* we have found a device */
}
}
}
panic("\n! Cannot locate virtio-scsi device !\n");
sclp_print("Warning: Could not locate a usable virtio-scsi device\n");
return -ENODEV;
}
int virtio_scsi_read_many(VDev *vdev,
@ -322,17 +329,20 @@ static void scsi_parse_capacity_report(void *data,
}
}
void virtio_scsi_setup(VDev *vdev)
int virtio_scsi_setup(VDev *vdev)
{
int retry_test_unit_ready = 3;
uint8_t data[256];
uint32_t data_size = sizeof(data);
ScsiInquiryEvpdPages *evpd = &scsi_inquiry_evpd_pages_response;
ScsiInquiryEvpdBl *evpd_bl = &scsi_inquiry_evpd_bl_response;
int i;
int i, ret;
vdev->scsi_device = &default_scsi_device;
virtio_scsi_locate_device(vdev);
ret = virtio_scsi_locate_device(vdev);
if (ret < 0) {
return ret;
}
/* We have to "ping" the device before it becomes readable */
while (!scsi_test_unit_ready(vdev)) {
@ -417,4 +427,6 @@ void virtio_scsi_setup(VDev *vdev)
}
scsi_parse_capacity_report(data, &vdev->scsi_last_block,
(uint32_t *) &vdev->scsi_block_size);
return 0;
}