aboutsummaryrefslogtreecommitdiff
path: root/hw/scsi
diff options
context:
space:
mode:
authorGreg Kurz <groug@kaod.org>2016-09-30 17:13:48 +0200
committerMichael S. Tsirkin <mst@redhat.com>2016-10-10 01:16:59 +0300
commitad14a46a36c6a17bd3d3445a8b0e1f6d421feac2 (patch)
tree0757f9099686b65fc99a97a6fec7e030a640c4c5 /hw/scsi
parent661e32fb3cb71c7e019daee375be4bb487b9917c (diff)
downloadqemu-ad14a46a36c6a17bd3d3445a8b0e1f6d421feac2.zip
qemu-ad14a46a36c6a17bd3d3445a8b0e1f6d421feac2.tar.gz
qemu-ad14a46a36c6a17bd3d3445a8b0e1f6d421feac2.tar.bz2
virtio-scsi: handle virtio_scsi_set_config() error
This error is caused by a buggy guest: let's switch the device to the broken state instead of terminating QEMU. Signed-off-by: Greg Kurz <groug@kaod.org> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/scsi')
-rw-r--r--hw/scsi/virtio-scsi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index b58de95..6eaadd8 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -644,8 +644,9 @@ static void virtio_scsi_set_config(VirtIODevice *vdev,
if ((uint32_t) virtio_ldl_p(vdev, &scsiconf->sense_size) >= 65536 ||
(uint32_t) virtio_ldl_p(vdev, &scsiconf->cdb_size) >= 256) {
- error_report("bad data written to virtio-scsi configuration space");
- exit(1);
+ virtio_error(vdev,
+ "bad data written to virtio-scsi configuration space");
+ return;
}
vs->sense_size = virtio_ldl_p(vdev, &scsiconf->sense_size);