diff options
Diffstat (limited to 'block')
| -rw-r--r-- | block/block-backend.c | 2 | ||||
| -rw-r--r-- | block/raw-posix.c | 8 | ||||
| -rw-r--r-- | block/raw_bsd.c | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index 225655126e..1db002c00c 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -769,7 +769,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 2e3db44e47..918c756c2e 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -2398,15 +2398,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) @@ -2532,7 +2530,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 63ee91164f..3c7b41387c 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->bs, offset); } -static int raw_is_inserted(BlockDriverState *bs) +static bool raw_is_inserted(BlockDriverState *bs) { return bdrv_is_inserted(bs->file->bs); } |