From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcxVe-0005ss-JO for qemu-devel@nongnu.org; Fri, 18 Sep 2015 11:23:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZcxVd-0005mq-LB for qemu-devel@nongnu.org; Fri, 18 Sep 2015 11:23:34 -0400 From: Max Reitz Date: Fri, 18 Sep 2015 17:22:40 +0200 Message-Id: <1442589793-7105-6-git-send-email-mreitz@redhat.com> In-Reply-To: <1442589793-7105-1-git-send-email-mreitz@redhat.com> References: <1442589793-7105-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v5 05/38] block: Make bdrv_is_inserted() return a bool List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: Kevin Wolf , Alberto Garcia , Markus Armbruster , qemu-devel@nongnu.org, Max Reitz , John Snow , Stefan Hajnoczi Make bdrv_is_inserted(), blk_is_inserted(), and the callback BlockDriver.bdrv_is_inserted() return a bool. Suggested-by: Eric Blake Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Alberto Garcia --- block.c | 12 +++++++----- block/block-backend.c | 2 +- block/raw-posix.c | 8 +++----- block/raw_bsd.c | 2 +- include/block/block.h | 2 +- include/block/block_int.h | 2 +- include/sysemu/block-backend.h | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/block.c b/block.c index 51d8c51..4a089e6 100644 --- a/block.c +++ b/block.c @@ -3244,14 +3244,16 @@ void bdrv_invalidate_cache_all(Error **errp) /** * Return TRUE if the media is present */ -int bdrv_is_inserted(BlockDriverState *bs) +bool bdrv_is_inserted(BlockDriverState *bs) { BlockDriver *drv = bs->drv; - if (!drv) - return 0; - if (!drv->bdrv_is_inserted) - return 1; + if (!drv) { + return false; + } + if (!drv->bdrv_is_inserted) { + return true; + } return drv->bdrv_is_inserted(bs); } diff --git a/block/block-backend.c b/block/block-backend.c index c2e8732..5ad2dd4 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -752,7 +752,7 @@ void blk_invalidate_cache(BlockBackend *blk, Error **errp) bdrv_invalidate_cache(blk->bs, errp); } -int blk_is_inserted(BlockBackend *blk) +bool blk_is_inserted(BlockBackend *blk) { return bdrv_is_inserted(blk->bs); } diff --git a/block/raw-posix.c b/block/raw-posix.c index e650c9b..d6e88e3 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -2389,15 +2389,13 @@ out: return prio; } -static int cdrom_is_inserted(BlockDriverState *bs) +static bool cdrom_is_inserted(BlockDriverState *bs) { BDRVRawState *s = bs->opaque; int ret; ret = ioctl(s->fd, CDROM_DRIVE_STATUS, CDSL_CURRENT); - if (ret == CDS_DISC_OK) - return 1; - return 0; + return ret == CDS_DISC_OK; } static void cdrom_eject(BlockDriverState *bs, bool eject_flag) @@ -2523,7 +2521,7 @@ static int cdrom_reopen(BlockDriverState *bs) return 0; } -static int cdrom_is_inserted(BlockDriverState *bs) +static bool cdrom_is_inserted(BlockDriverState *bs) { return raw_getlength(bs) > 0; } diff --git a/block/raw_bsd.c b/block/raw_bsd.c index e3d2d04..d718583 100644 --- a/block/raw_bsd.c +++ b/block/raw_bsd.c @@ -154,7 +154,7 @@ static int raw_truncate(BlockDriverState *bs, int64_t offset) return bdrv_truncate(bs->file, offset); } -static int raw_is_inserted(BlockDriverState *bs) +static bool raw_is_inserted(BlockDriverState *bs) { return bdrv_is_inserted(bs->file); } diff --git a/include/block/block.h b/include/block/block.h index ef67353..c9cc62b 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -397,7 +397,7 @@ int bdrv_is_read_only(BlockDriverState *bs); int bdrv_is_sg(BlockDriverState *bs); int bdrv_enable_write_cache(BlockDriverState *bs); void bdrv_set_enable_write_cache(BlockDriverState *bs, bool wce); -int bdrv_is_inserted(BlockDriverState *bs); +bool bdrv_is_inserted(BlockDriverState *bs); int bdrv_media_changed(BlockDriverState *bs); void bdrv_lock_medium(BlockDriverState *bs, bool locked); void bdrv_eject(BlockDriverState *bs, bool eject_flag); diff --git a/include/block/block_int.h b/include/block/block_int.h index 14ad4c3..f3b3354 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -213,7 +213,7 @@ struct BlockDriver { const char *backing_file, const char *backing_fmt); /* removable device specific */ - int (*bdrv_is_inserted)(BlockDriverState *bs); + bool (*bdrv_is_inserted)(BlockDriverState *bs); int (*bdrv_media_changed)(BlockDriverState *bs); void (*bdrv_eject)(BlockDriverState *bs, bool eject_flag); void (*bdrv_lock_medium)(BlockDriverState *bs, bool locked); diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 8fc960f..8f2bf10 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -130,7 +130,7 @@ int blk_is_sg(BlockBackend *blk); int blk_enable_write_cache(BlockBackend *blk); void blk_set_enable_write_cache(BlockBackend *blk, bool wce); void blk_invalidate_cache(BlockBackend *blk, Error **errp); -int blk_is_inserted(BlockBackend *blk); +bool blk_is_inserted(BlockBackend *blk); void blk_lock_medium(BlockBackend *blk, bool locked); void blk_eject(BlockBackend *blk, bool eject_flag); int blk_get_flags(BlockBackend *blk); -- 2.5.2