[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 09/25] scsi: commonize purging requests
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v5 09/25] scsi: commonize purging requests |
Date: |
Thu, 26 May 2011 12:56:35 +0200 |
The code for canceling requests upon reset is already the same. Clean
it up and move it to scsi-bus.c.
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Christoph Hellwig <address@hidden>
---
hw/scsi-bus.c | 12 ++++++++++++
hw/scsi-disk.c | 18 ++----------------
hw/scsi-generic.c | 18 ++----------------
hw/scsi.h | 1 +
4 files changed, 17 insertions(+), 32 deletions(-)
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 46f60e1..cb3ba5f 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -549,6 +549,18 @@ void scsi_req_complete(SCSIRequest *req)
scsi_req_unref(req);
}
+void scsi_device_purge_requests(SCSIDevice *sdev)
+{
+ SCSIRequest *req;
+
+ while (!QTAILQ_EMPTY(&sdev->requests)) {
+ req = QTAILQ_FIRST(&sdev->requests);
+ sdev->info->cancel_io(req);
+ scsi_req_dequeue(req);
+ scsi_req_unref(req);
+ }
+}
+
static char *scsibus_get_fw_dev_path(DeviceState *dev)
{
SCSIDevice *d = (SCSIDevice*)dev;
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index f7c09c9..38fbb05 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -1147,26 +1147,12 @@ static int32_t scsi_send_command(SCSIRequest *req,
uint8_t *buf)
return len;
}
-static void scsi_disk_purge_requests(SCSIDiskState *s)
-{
- SCSIDiskReq *r;
-
- while (!QTAILQ_EMPTY(&s->qdev.requests)) {
- r = DO_UPCAST(SCSIDiskReq, req, QTAILQ_FIRST(&s->qdev.requests));
- if (r->req.aiocb) {
- bdrv_aio_cancel(r->req.aiocb);
- }
- scsi_req_dequeue(&r->req);
- scsi_req_unref(&r->req);
- }
-}
-
static void scsi_disk_reset(DeviceState *dev)
{
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev.qdev, dev);
uint64_t nb_sectors;
- scsi_disk_purge_requests(s);
+ scsi_device_purge_requests(&s->qdev);
bdrv_get_geometry(s->bs, &nb_sectors);
nb_sectors /= s->cluster_size;
@@ -1180,7 +1166,7 @@ static void scsi_destroy(SCSIDevice *dev)
{
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev);
- scsi_disk_purge_requests(s);
+ scsi_device_purge_requests(&s->qdev);
blockdev_mark_auto_del(s->qdev.conf.bs);
}
diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c
index 3740432..72c4cc7 100644
--- a/hw/scsi-generic.c
+++ b/hw/scsi-generic.c
@@ -424,32 +424,18 @@ static int get_stream_blocksize(BlockDriverState *bdrv)
return (buf[9] << 16) | (buf[10] << 8) | buf[11];
}
-static void scsi_generic_purge_requests(SCSIGenericState *s)
-{
- SCSIGenericReq *r;
-
- while (!QTAILQ_EMPTY(&s->qdev.requests)) {
- r = DO_UPCAST(SCSIGenericReq, req, QTAILQ_FIRST(&s->qdev.requests));
- if (r->req.aiocb) {
- bdrv_aio_cancel(r->req.aiocb);
- }
- scsi_req_dequeue(&r->req);
- scsi_req_unref(&r->req);
- }
-}
-
static void scsi_generic_reset(DeviceState *dev)
{
SCSIGenericState *s = DO_UPCAST(SCSIGenericState, qdev.qdev, dev);
- scsi_generic_purge_requests(s);
+ scsi_device_purge_requests(&s->qdev);
}
static void scsi_destroy(SCSIDevice *d)
{
SCSIGenericState *s = DO_UPCAST(SCSIGenericState, qdev, d);
- scsi_generic_purge_requests(s);
+ scsi_device_purge_requests(&s->qdev);
blockdev_mark_auto_del(s->qdev.conf.bs);
}
diff --git a/hw/scsi.h b/hw/scsi.h
index 19bd1ae..f1d8888 100644
--- a/hw/scsi.h
+++ b/hw/scsi.h
@@ -114,5 +114,6 @@ int scsi_req_parse(SCSIRequest *req, uint8_t *buf);
void scsi_req_print(SCSIRequest *req);
void scsi_req_data(SCSIRequest *req, int len);
void scsi_req_complete(SCSIRequest *req);
+void scsi_device_purge_requests(SCSIDevice *sdev);
#endif
--
1.7.4.4
[Qemu-devel] [PATCH v5 02/25] scsi-generic: Remove bogus double complete, Paolo Bonzini, 2011/05/26
[Qemu-devel] [PATCH v5 04/25] scsi: introduce SCSIBusOps, Paolo Bonzini, 2011/05/26
[Qemu-devel] [PATCH v5 06/25] scsi: reference-count requests, Paolo Bonzini, 2011/05/26
[Qemu-devel] [PATCH v5 07/25] lsi: extract lsi_find_by_tag, Paolo Bonzini, 2011/05/26
[Qemu-devel] [PATCH v5 10/25] scsi: introduce scsi_req_abort, Paolo Bonzini, 2011/05/26
[Qemu-devel] [PATCH v5 12/25] scsi: use scsi_req_complete, Paolo Bonzini, 2011/05/26
[Qemu-devel] [PATCH v5 09/25] scsi: commonize purging requests,
Paolo Bonzini <=
[Qemu-devel] [PATCH v5 11/25] scsi: introduce scsi_req_cancel, Paolo Bonzini, 2011/05/26
[Qemu-devel] [PATCH v5 13/25] scsi: Update sense code handling, Paolo Bonzini, 2011/05/26
[Qemu-devel] [PATCH v5 14/25] scsi: do not call send_command directly, Paolo Bonzini, 2011/05/26
[Qemu-devel] [PATCH v5 16/25] scsi: introduce scsi_req_continue, Paolo Bonzini, 2011/05/26
[Qemu-devel] [PATCH v5 17/25] scsi: introduce scsi_req_get_buf, Paolo Bonzini, 2011/05/26
[Qemu-devel] [PATCH v5 08/25] scsi: Use 'SCSIRequest' directly, Paolo Bonzini, 2011/05/26
[Qemu-devel] [PATCH v5 18/25] scsi: Implement 'get_sense' callback, Paolo Bonzini, 2011/05/26
[Qemu-devel] [PATCH v5 15/25] scsi: introduce scsi_req_new, Paolo Bonzini, 2011/05/26
[Qemu-devel] [PATCH v5 19/25] scsi-disk: add data direction checking, Paolo Bonzini, 2011/05/26