[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/16] scsi: report unit attention on reset
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 15/16] scsi: report unit attention on reset |
Date: |
Wed, 3 Aug 2011 10:49:18 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 a5bb517..f6fb4f0 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -1089,7 +1089,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;
@@ -1097,6 +1097,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 5f21d68..655fcda 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -1098,7 +1098,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;
@@ -1112,7 +1112,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 c122ad3..e8053da 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 09c3606..98fd689 100644
--- a/hw/scsi.h
+++ b/hw/scsi.h
@@ -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
--
1.7.6
- Re: [Qemu-devel] [PATCH 01/16] scsi-disk: no need to call scsi_req_data on a short read, (continued)
- [Qemu-devel] [PATCH 08/16] scsi: introduce SCSICommand, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 07/16] scsi: pass cdb already to scsi_req_new, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 11/16] scsi: move handling of REPORT LUNS and invalid LUNs to common code, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 13/16] scsi: add a bunch more common sense codes, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 12/16] scsi: move handling of REQUEST SENSE to common code, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 14/16] scsi: add support for unit attention conditions, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 09/16] scsi: push lun field to SCSIDevice, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 15/16] scsi: report unit attention on reset,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 10/16] scsi: move request parsing to common code, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 04/16] scsi: move sense handling to generic code, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 16/16] scsi: add special traces for common commands, Paolo Bonzini, 2011/08/03
- Re: [Qemu-devel] [PATCH 00/16] SCSI sense and target request overhaul, Anthony Liguori, 2011/08/12