diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2011-08-03 10:49:18 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-12 08:31:28 -0500 |
| commit | c7b488721d6aafe32994ac63f8d690ae6d4729fa (patch) | |
| tree | d2924e0c0ca4744c71e76f169643b2437604a4a0 | |
| parent | 6dc06f08b3d6c0347df00ac68d9f30e2b233a749 (diff) | |
scsi: report unit attention on reset
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/scsi-bus.c | 3 | ||||
| -rw-r--r-- | hw/scsi-disk.c | 4 | ||||
| -rw-r--r-- | hw/scsi-generic.c | 4 | ||||
| -rw-r--r-- | hw/scsi.h | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 564b840eb7..9b2d12dc48 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -1099,7 +1099,7 @@ void scsi_req_abort(SCSIRequest *req, int status) scsi_req_complete(req, status); } -void scsi_device_purge_requests(SCSIDevice *sdev) +void scsi_device_purge_requests(SCSIDevice *sdev, SCSISense sense) { SCSIRequest *req; @@ -1107,6 +1107,7 @@ void scsi_device_purge_requests(SCSIDevice *sdev) req = QTAILQ_FIRST(&sdev->requests); scsi_req_cancel(req); } + sdev->unit_attention = sense; } static char *scsibus_get_fw_dev_path(DeviceState *dev) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index a33da55663..f848318e7c 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1087,7 +1087,7 @@ static void scsi_disk_reset(DeviceState *dev) SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev.qdev, dev); uint64_t nb_sectors; - scsi_device_purge_requests(&s->qdev); + scsi_device_purge_requests(&s->qdev, SENSE_CODE(RESET)); bdrv_get_geometry(s->bs, &nb_sectors); nb_sectors /= s->cluster_size; @@ -1101,7 +1101,7 @@ static void scsi_destroy(SCSIDevice *dev) { SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); - scsi_device_purge_requests(&s->qdev); + scsi_device_purge_requests(&s->qdev, SENSE_CODE(NO_SENSE)); blockdev_mark_auto_del(s->qdev.conf.bs); } diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 83723acd1e..b63371e65f 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -381,14 +381,14 @@ static void scsi_generic_reset(DeviceState *dev) { SCSIGenericState *s = DO_UPCAST(SCSIGenericState, qdev.qdev, dev); - scsi_device_purge_requests(&s->qdev); + scsi_device_purge_requests(&s->qdev, SENSE_CODE(RESET)); } static void scsi_destroy(SCSIDevice *d) { SCSIGenericState *s = DO_UPCAST(SCSIGenericState, qdev, d); - scsi_device_purge_requests(&s->qdev); + scsi_device_purge_requests(&s->qdev, SENSE_CODE(NO_SENSE)); blockdev_mark_auto_del(s->qdev.conf.bs); } @@ -187,7 +187,7 @@ uint8_t *scsi_req_get_buf(SCSIRequest *req); int scsi_req_get_sense(SCSIRequest *req, uint8_t *buf, int len); void scsi_req_abort(SCSIRequest *req, int status); void scsi_req_cancel(SCSIRequest *req); -void scsi_device_purge_requests(SCSIDevice *sdev); +void scsi_device_purge_requests(SCSIDevice *sdev, SCSISense sense); int scsi_device_get_sense(SCSIDevice *dev, uint8_t *buf, int len, bool fixed); #endif |