From f7326c723091ec946f80424be012dba9e029e497 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 22 Feb 2012 14:11:34 +0100 Subject: [PATCH 018/109] scsi: report unit attention on reset RH-Author: Paolo Bonzini Message-id: <1329919979-20948-18-git-send-email-pbonzini@redhat.com> Patchwork-id: 37496 O-Subject: [RHEL 6.3 qemu-kvm PATCH v2 017/102] scsi: report unit attention on reset Bugzilla: 782029 RH-Acked-by: Gerd Hoffmann RH-Acked-by: Laszlo Ersek RH-Acked-by: Orit Wasserman Signed-off-by: Paolo Bonzini Signed-off-by: Anthony Liguori (cherry picked from c7b488721d6aafe32994ac63f8d690ae6d4729fa) --- hw/scsi-bus.c | 3 ++- hw/scsi-disk.c | 4 ++-- hw/scsi-generic.c | 4 ++-- hw/scsi.h | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) Signed-off-by: Michal Novotny --- hw/scsi-bus.c | 3 ++- hw/scsi-disk.c | 4 ++-- hw/scsi-generic.c | 4 ++-- hw/scsi.h | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 56d5046..7ac8c1c 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -1111,7 +1111,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; @@ -1119,6 +1119,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 430a7c3..3872ca4 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1167,7 +1167,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; @@ -1181,7 +1181,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 a4809d0..0d24ed0 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); } diff --git a/hw/scsi.h b/hw/scsi.h index 532fd1e..a28cd68 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -191,7 +191,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 -- 1.7.7.6