diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2011-11-14 17:50:52 +0100 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2011-12-15 12:40:08 +0100 |
commit | 6bee44ea346aed24e12d525daf10542d695508db (patch) | |
tree | e87afbfbc8d0df17e9c5eae3399afd6ceec65dcf /dma-helpers.c | |
parent | 91977c2e5f6419d00f4ae2800586f009b6070ab1 (diff) | |
download | qemu-6bee44ea346aed24e12d525daf10542d695508db.zip qemu-6bee44ea346aed24e12d525daf10542d695508db.tar.gz qemu-6bee44ea346aed24e12d525daf10542d695508db.tar.bz2 |
dma: the passed io_func does not return NULL
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 <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'dma-helpers.c')
-rw-r--r-- | 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) |