summaryrefslogtreecommitdiff
path: root/hw/ide/macio.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2011-11-14 17:50:53 +0100
committerKevin Wolf <kwolf@redhat.com>2011-12-15 12:40:08 +0100
commitb9b2008bbff49e2714491a95109e1189e54a6491 (patch)
treeaa4ab3960bd6abfd16165666b7ddc763916880a4 /hw/ide/macio.c
parent6bee44ea346aed24e12d525daf10542d695508db (diff)
downloadqemu-b9b2008bbff49e2714491a95109e1189e54a6491.zip
block: dma_bdrv_* does not return NULL
Initially attempted with the following semantic patch: @ rule1 @ expression E; statement S; @@ E = ( dma_bdrv_io | dma_bdrv_read | dma_bdrv_write ) (...); ( - if (E == NULL) { ... } | - if (E) { <... S ...> } ) which however did not match anything. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide/macio.c')
-rw-r--r--hw/ide/macio.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index 40f60f018e..abbc41b59e 100644
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -152,10 +152,8 @@ static void pmac_ide_transfer_cb(void *opaque, int ret)
ide_issue_trim, pmac_ide_transfer_cb, s, true);
break;
}
-
- if (!m->aiocb)
- pmac_ide_transfer_cb(io, -1);
return;
+
done:
if (s->dma_cmd == IDE_DMA_READ || s->dma_cmd == IDE_DMA_WRITE) {
bdrv_acct_done(s->bs, &s->acct);