openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: make code more homogeneous in AIO callback functions 

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 <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-04-19 14:00:24 +02:00
parent b8aba8d7e3
commit 80624c938d
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/scsi-disk.c
View File

@ -160,7 +160,7 @@ static void scsi_dma_complete(void *opaque, int ret)
bdrv_acct_done(s->qdev.conf.bs, &r->acct); bdrv_acct_done(s->qdev.conf.bs, &r->acct);
if (ret) { if (ret < 0) {
if (scsi_handle_rw_error(r, -ret)) { if (scsi_handle_rw_error(r, -ret)) {
goto done; goto done;
} }
@ -187,7 +187,7 @@ static void scsi_read_complete(void * opaque, int ret)
bdrv_acct_done(s->qdev.conf.bs, &r->acct); bdrv_acct_done(s->qdev.conf.bs, &r->acct);
} }
if (ret) { if (ret < 0) {
if (scsi_handle_rw_error(r, -ret)) { if (scsi_handle_rw_error(r, -ret)) {
goto done; goto done;
} }
@ -211,10 +211,7 @@ static void scsi_flush_complete(void * opaque, int ret)
SCSIDiskReq *r = (SCSIDiskReq *)opaque; SCSIDiskReq *r = (SCSIDiskReq *)opaque;
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
if (r->req.aiocb != NULL) { bdrv_acct_done(s->qdev.conf.bs, &r->acct);
r->req.aiocb = NULL;
bdrv_acct_done(s->qdev.conf.bs, &r->acct);
}
if (ret < 0) { if (ret < 0) {
if (scsi_handle_rw_error(r, -ret)) { 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); bdrv_acct_done(s->qdev.conf.bs, &r->acct);
} }
if (ret) { if (ret < 0) {
if (scsi_handle_rw_error(r, -ret)) { if (scsi_handle_rw_error(r, -ret)) {
goto done; goto done;
} }