[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 09/24] scsi: introduce scsi_req_abort
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v4 09/24] scsi: introduce scsi_req_abort |
Date: |
Mon, 23 May 2011 18:08:54 +0200 |
This covers the case of canceling a request's I/O and still
completing it.
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Christoph Hellwig <address@hidden>
---
hw/scsi-bus.c | 9 +++++++++
hw/scsi.h | 1 +
hw/spapr_vscsi.c | 8 ++------
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index a3eb522..b4ba8cd 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -549,6 +549,15 @@ void scsi_req_complete(SCSIRequest *req)
scsi_req_unref(req);
}
+void scsi_req_abort(SCSIRequest *req, int status)
+{
+ req->status = status;
+ if (req->dev && req->dev->info->cancel_io) {
+ req->dev->info->cancel_io(req);
+ }
+ scsi_req_complete(req);
+}
+
void scsi_device_purge_requests(SCSIDevice *sdev)
{
SCSIRequest *req;
diff --git a/hw/scsi.h b/hw/scsi.h
index 55a24eb..e915ef8 100644
--- a/hw/scsi.h
+++ b/hw/scsi.h
@@ -114,6 +114,7 @@ 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_req_abort(SCSIRequest *req, int status);
void scsi_device_purge_requests(SCSIDevice *sdev);
#endif
diff --git a/hw/spapr_vscsi.c b/hw/spapr_vscsi.c
index cf2ed73..678cd00 100644
--- a/hw/spapr_vscsi.c
+++ b/hw/spapr_vscsi.c
@@ -463,10 +463,8 @@ static void vscsi_send_request_sense(VSCSIState *s,
vscsi_req *req)
dprintf("VSCSI: Queued request sense tag 0x%x\n", req->qtag);
if (n < 0) {
fprintf(stderr, "VSCSI: REQUEST_SENSE wants write data !?!?!?\n");
- sdev->info->cancel_io(req->sreq);
vscsi_makeup_sense(s, req, HARDWARE_ERROR, 0, 0);
- vscsi_send_rsp(s, req, CHECK_CONDITION, 0, 0);
- vscsi_put_req(s, req);
+ scsi_req_abort(req->sreq, CHECK_CONDITION);
return;
} else if (n == 0) {
return;
@@ -547,10 +545,8 @@ static void vscsi_command_complete(SCSIRequest *sreq, int
reason, uint32_t arg)
}
if (rc < 0) {
fprintf(stderr, "VSCSI: RDMA error rc=%d!\n", rc);
- sdev->info->cancel_io(sreq);
vscsi_makeup_sense(s, req, HARDWARE_ERROR, 0, 0);
- vscsi_send_rsp(s, req, CHECK_CONDITION, 0, 0);
- vscsi_put_req(s, req);
+ scsi_req_abort(req->sreq, CHECK_CONDITION);
return;
}
--
1.7.4.4
- [Qemu-devel] [PATCH v4 00/24] SCSI subsystem improvements, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 01/24] scsi: add tracing of scsi requests, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 02/24] scsi-generic: Remove bogus double complete, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 03/24] scsi: introduce scsi_req_data, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 04/24] scsi: introduce SCSIBusOps, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 05/24] scsi: reference-count requests, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 06/24] lsi: extract lsi_find_by_tag, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 08/24] scsi: commonize purging requests, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 07/24] scsi: Use 'SCSIRequest' directly, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 09/24] scsi: introduce scsi_req_abort,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v4 10/24] scsi: introduce scsi_req_cancel, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 11/24] scsi: use scsi_req_complete, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 12/24] scsi: Update sense code handling, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 14/24] scsi: introduce scsi_req_new, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 13/24] scsi: do not call send_command directly, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 15/24] scsi: introduce scsi_req_continue, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 16/24] scsi: introduce scsi_req_get_buf, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 17/24] scsi: Implement 'get_sense' callback, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 18/24] scsi-disk: add data direction checking, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 19/24] scsi: make write_data return void, Paolo Bonzini, 2011/05/23