From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:32825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPzkc-0004kn-RG for qemu-devel@nongnu.org; Mon, 14 Nov 2011 11:51:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RPzkb-0000wq-MU for qemu-devel@nongnu.org; Mon, 14 Nov 2011 11:51:18 -0500 Received: from mail-gx0-f173.google.com ([209.85.161.173]:61768) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPzkb-0000vM-GX for qemu-devel@nongnu.org; Mon, 14 Nov 2011 11:51:17 -0500 Received: by mail-gx0-f173.google.com with SMTP id r4so347544ggn.4 for ; Mon, 14 Nov 2011 08:51:17 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 14 Nov 2011 17:50:53 +0100 Message-Id: <1321289454-9219-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1321289454-9219-1-git-send-email-pbonzini@redhat.com> References: <1321289454-9219-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1.1 5/6] block: dma_bdrv_* does not return NULL List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- hw/ide/core.c | 6 ------ hw/ide/macio.c | 4 +--- 2 files changed, 1 insertions(+), 9 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 39d945e..600eb28 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -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: diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 8965643..43b5ee7 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); -- 1.7.7.1