From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:42168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbBxG-0000T9-H5 for qemu-devel@nongnu.org; Thu, 15 Dec 2011 09:06:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RbBx6-0004cI-DC for qemu-devel@nongnu.org; Thu, 15 Dec 2011 09:06:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:21725) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbBx5-0004bw-SF for qemu-devel@nongnu.org; Thu, 15 Dec 2011 09:06:28 -0500 From: Kevin Wolf Date: Thu, 15 Dec 2011 15:09:19 +0100 Message-Id: <1323958169-8333-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1323958169-8333-1-git-send-email-kwolf@redhat.com> References: <1323958169-8333-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 04/14] dma: the passed io_func does not return NULL List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Paolo Bonzini Initially found with the following semantic patch: @ type @ BlockDriverAIOCB *x; expression E; @@ x = E; - if (x == NULL) { ... } @ acb1 @ expression E, E1; @@ E1->acb = E; - if (E1->acb == NULL) { ... } @ aiocb1 @ expression E, E1; @@ E1->aiocb = E; - if (E1->aiocb == NULL) { ... } @ acb @ expression E, E1; @@ E1.acb = E; - if (E1.acb == NULL) { ... } @ aiocb @ expression E, E1; @@ E1.aiocb = E; - if (E1.aiocb == NULL) { ... } but changed manually to include an assert. Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- dma-helpers.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dma-helpers.c b/dma-helpers.c index 9d6b6fa..f08cdb5 100644 --- a/dma-helpers.c +++ b/dma-helpers.c @@ -142,9 +142,7 @@ static void dma_bdrv_cb(void *opaque, int ret) dbs->acb = dbs->io_func(dbs->bs, dbs->sector_num, &dbs->iov, dbs->iov.size / 512, dma_bdrv_cb, dbs); - if (!dbs->acb) { - dma_complete(dbs, -EIO); - } + assert(dbs->acb); } static void dma_aio_cancel(BlockDriverAIOCB *acb) -- 1.7.6.4