| Message ID | 20180327130846.21902-1-danielhb@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/1] block-backend: simplify blk_get_aio_context | expand |
On Tue, Mar 27, 2018 at 10:08:46AM -0300, Daniel Henrique Barboza wrote: >blk_get_aio_context verifies if BlockDriverState bs is not NULL, >return bdrv_get_aio_context(bs) if true or qemu_get_aio_context() >otherwise. However, bdrv_get_aio_context from block.c already does >this verification itself, also returning qemu_get_aio_context() >if bs is NULL: > >AioContext *bdrv_get_aio_context(BlockDriverState *bs) >{ > return bs ? bs->aio_context : qemu_get_aio_context(); >} > >This patch simplifies blk_get_aio_context to simply call >bdrv_get_aio_context instead of replicating the same logic. > >Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> Seems to make sense. Reviewed-by: Darren Kenny <darren.kenny@oracle.com> >--- > block/block-backend.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > >diff --git a/block/block-backend.c b/block/block-backend.c >index 681b240b12..89f47b00ea 100644 >--- a/block/block-backend.c >+++ b/block/block-backend.c >@@ -1865,13 +1865,7 @@ void blk_op_unblock_all(BlockBackend *blk, Error *reason) > > AioContext *blk_get_aio_context(BlockBackend *blk) > { >- BlockDriverState *bs = blk_bs(blk); >- >- if (bs) { >- return bdrv_get_aio_context(bs); >- } else { >- return qemu_get_aio_context(); >- } >+ return bdrv_get_aio_context(blk_bs(blk)); > } > > static AioContext *blk_aiocb_get_aio_context(BlockAIOCB *acb) >-- >2.14.3 > >
Ping On 03/27/2018 10:08 AM, Daniel Henrique Barboza wrote: > blk_get_aio_context verifies if BlockDriverState bs is not NULL, > return bdrv_get_aio_context(bs) if true or qemu_get_aio_context() > otherwise. However, bdrv_get_aio_context from block.c already does > this verification itself, also returning qemu_get_aio_context() > if bs is NULL: > > AioContext *bdrv_get_aio_context(BlockDriverState *bs) > { > return bs ? bs->aio_context : qemu_get_aio_context(); > } > > This patch simplifies blk_get_aio_context to simply call > bdrv_get_aio_context instead of replicating the same logic. > > Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> > --- > block/block-backend.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/block/block-backend.c b/block/block-backend.c > index 681b240b12..89f47b00ea 100644 > --- a/block/block-backend.c > +++ b/block/block-backend.c > @@ -1865,13 +1865,7 @@ void blk_op_unblock_all(BlockBackend *blk, Error *reason) > > AioContext *blk_get_aio_context(BlockBackend *blk) > { > - BlockDriverState *bs = blk_bs(blk); > - > - if (bs) { > - return bdrv_get_aio_context(bs); > - } else { > - return qemu_get_aio_context(); > - } > + return bdrv_get_aio_context(blk_bs(blk)); > } > > static AioContext *blk_aiocb_get_aio_context(BlockAIOCB *acb)
Am 27.03.2018 um 15:08 hat Daniel Henrique Barboza geschrieben: > blk_get_aio_context verifies if BlockDriverState bs is not NULL, > return bdrv_get_aio_context(bs) if true or qemu_get_aio_context() > otherwise. However, bdrv_get_aio_context from block.c already does > this verification itself, also returning qemu_get_aio_context() > if bs is NULL: > > AioContext *bdrv_get_aio_context(BlockDriverState *bs) > { > return bs ? bs->aio_context : qemu_get_aio_context(); > } > > This patch simplifies blk_get_aio_context to simply call > bdrv_get_aio_context instead of replicating the same logic. > > Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> Thanks, applied to the block-next branch. Kevin
diff --git a/block/block-backend.c b/block/block-backend.c index 681b240b12..89f47b00ea 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1865,13 +1865,7 @@ void blk_op_unblock_all(BlockBackend *blk, Error *reason) AioContext *blk_get_aio_context(BlockBackend *blk) { - BlockDriverState *bs = blk_bs(blk); - - if (bs) { - return bdrv_get_aio_context(bs); - } else { - return qemu_get_aio_context(); - } + return bdrv_get_aio_context(blk_bs(blk)); } static AioContext *blk_aiocb_get_aio_context(BlockAIOCB *acb)
blk_get_aio_context verifies if BlockDriverState bs is not NULL, return bdrv_get_aio_context(bs) if true or qemu_get_aio_context() otherwise. However, bdrv_get_aio_context from block.c already does this verification itself, also returning qemu_get_aio_context() if bs is NULL: AioContext *bdrv_get_aio_context(BlockDriverState *bs) { return bs ? bs->aio_context : qemu_get_aio_context(); } This patch simplifies blk_get_aio_context to simply call bdrv_get_aio_context instead of replicating the same logic. Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> --- block/block-backend.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)