mirror of https://github.com/proxmox/mirror_qemu
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>master
parent
6bee44ea34
commit
b9b2008bbf
|
@ -549,7 +549,6 @@ void ide_dma_cb(void *opaque, int ret)
|
|||
int n;
|
||||
int64_t sector_num;
|
||||
|
||||
handle_rw_error:
|
||||
if (ret < 0) {
|
||||
int op = BM_STATUS_DMA_RETRY;
|
||||
|
||||
|
@ -608,11 +607,6 @@ handle_rw_error:
|
|||
ide_issue_trim, ide_dma_cb, s, true);
|
||||
break;
|
||||
}
|
||||
|
||||
if (!s->bus->dma->aiocb) {
|
||||
ret = -1;
|
||||
goto handle_rw_error;
|
||||
}
|
||||
return;
|
||||
|
||||
eot:
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue