[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/16] scsi: make code more homogeneous in AIO callb
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 06/16] scsi: make code more homogeneous in AIO callback functions |
Date: |
Thu, 19 Apr 2012 16:29:26 +0200 |
First scsi_flush_complete, like scsi_dma_complete, is always called with
an active AIOCB.
Second, always test for "ret < 0" to check for errors.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi-disk.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 792e9d0..1664793 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -160,7 +160,7 @@ static void scsi_dma_complete(void *opaque, int ret)
bdrv_acct_done(s->qdev.conf.bs, &r->acct);
- if (ret) {
+ if (ret < 0) {
if (scsi_handle_rw_error(r, -ret)) {
goto done;
}
@@ -187,7 +187,7 @@ static void scsi_read_complete(void * opaque, int ret)
bdrv_acct_done(s->qdev.conf.bs, &r->acct);
}
- if (ret) {
+ if (ret < 0) {
if (scsi_handle_rw_error(r, -ret)) {
goto done;
}
@@ -211,10 +211,7 @@ static void scsi_flush_complete(void * opaque, int ret)
SCSIDiskReq *r = (SCSIDiskReq *)opaque;
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
- if (r->req.aiocb != NULL) {
- r->req.aiocb = NULL;
- bdrv_acct_done(s->qdev.conf.bs, &r->acct);
- }
+ bdrv_acct_done(s->qdev.conf.bs, &r->acct);
if (ret < 0) {
if (scsi_handle_rw_error(r, -ret)) {
@@ -335,7 +332,7 @@ static void scsi_write_complete(void * opaque, int ret)
bdrv_acct_done(s->qdev.conf.bs, &r->acct);
}
- if (ret) {
+ if (ret < 0) {
if (scsi_handle_rw_error(r, -ret)) {
goto done;
}
--
1.7.9.3
- [Qemu-devel] [PULL 00/16] Pending SCSI patches for 1.1, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 01/16] scsi: fix memory leak, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 03/16] virtio: add virtio_queue_get_id, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 05/16] scsi: add missing test for cancelled request, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 02/16] virtio-scsi: prepare migration format for multiqueue, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 04/16] virtio-scsi: add multiqueue capability, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 06/16] scsi: make code more homogeneous in AIO callback functions,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 10/16] scsi: add a started field to SCSIDiskReq, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 07/16] scsi: move scsi_flush_complete around, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 11/16] scsi: support FUA on reads, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 08/16] scsi: add support for FUA on writes, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 09/16] scsi: force unit access on VERIFY, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 13/16] scsi: advertise DPOFUA, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 12/16] scsi: small refactoring of MMC mode-sense, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 16/16] scsi: add SANITIZE command, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 14/16] SCSI emulation: Support unmap via WRITE_SAME_10., Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 15/16] SCSI emulation: should tell the guest that we actually support thin provisioning, Paolo Bonzini, 2012/04/19