diff options
| author | Max Reitz <mreitz@redhat.com> | 2015-10-19 17:53:11 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-10-23 18:18:22 +0200 |
| commit | e031f750483377a5e5de4c92af68dfa68e4d0aae (patch) | |
| tree | 06482e05eac9020623c7ba715110bb6b9dacad2d /block/raw-posix.c | |
| parent | 8e9e653038db97bfd343c3fb217b7bf4da765a89 (diff) | |
block: Make bdrv_is_inserted() return a bool
Make bdrv_is_inserted(), blk_is_inserted(), and the callback
BlockDriver.bdrv_is_inserted() return a bool.
Suggested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/raw-posix.c')
| -rw-r--r-- | block/raw-posix.c | 8 |
1 files changed, 3 insertions, 5 deletions
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; } |