[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1.1 4/6] dma: the passed io_func does not return NUL
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 1.1 4/6] dma: the passed io_func does not return NULL |
Date: |
Mon, 14 Nov 2011 17:50:52 +0100 |
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 <address@hidden>
---
dma-helpers.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/dma-helpers.c b/dma-helpers.c
index bdcd38c..a79a2f9 100644
--- a/dma-helpers.c
+++ b/dma-helpers.c
@@ -136,9 +136,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.7.1
- [Qemu-devel] [PATCH 1.1 0/6] block: drop useless checks for NULL, Paolo Bonzini, 2011/11/14
- [Qemu-devel] [PATCH 1.1 1/6] block: bdrv_aio_* do not return NULL, Paolo Bonzini, 2011/11/14
- [Qemu-devel] [PATCH 1.1 3/6] block: qemu_aio_get does not return NULL, Paolo Bonzini, 2011/11/14
- [Qemu-devel] [PATCH 1.1 2/6] block: simplify failure handling for bdrv_aio_multiwrite, Paolo Bonzini, 2011/11/14
- [Qemu-devel] [PATCH 1.1 4/6] dma: the passed io_func does not return NULL,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 1.1 5/6] block: dma_bdrv_* does not return NULL, Paolo Bonzini, 2011/11/14
- [Qemu-devel] [PATCH 1.1 6/6] block: avoid useless checks on acb->bh, Paolo Bonzini, 2011/11/14
- [Qemu-devel] [PATCH 1.1 v2] block: bdrv_aio_* do not return NULL, Paolo Bonzini, 2011/11/30
- Re: [Qemu-devel] [PATCH 1.1 0/6] block: drop useless checks for NULL, Paolo Bonzini, 2011/11/30