OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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>
This commit is contained in:
Max Reitz 2015-10-19 17:53:11 +02:00 committed by Kevin Wolf
parent 8e9e653038
commit e031f75048
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block.c
View File

@ -3140,14 +3140,16 @@ void bdrv_invalidate_cache_all(Error **errp)
/** /**
* Return TRUE if the media is present * Return TRUE if the media is present
*/ */
int bdrv_is_inserted(BlockDriverState *bs) bool bdrv_is_inserted(BlockDriverState *bs)
{ {
BlockDriver *drv = bs->drv; BlockDriver *drv = bs->drv;
if (!drv) if (!drv) {
return 0; return false;
if (!drv->bdrv_is_inserted) }
return 1; if (!drv->bdrv_is_inserted) {
return true;
}
return drv->bdrv_is_inserted(bs); return drv->bdrv_is_inserted(bs);
} }

2
block/block-backend.c
View File

@ -769,7 +769,7 @@ void blk_invalidate_cache(BlockBackend *blk, Error **errp)
bdrv_invalidate_cache(blk->bs, 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); return bdrv_is_inserted(blk->bs);
} }

8
block/raw-posix.c
View File

@ -2398,15 +2398,13 @@ out:
return prio; return prio;
} }
static int cdrom_is_inserted(BlockDriverState *bs) static bool cdrom_is_inserted(BlockDriverState *bs)
{ {
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
int ret; int ret;
ret = ioctl(s->fd, CDROM_DRIVE_STATUS, CDSL_CURRENT); ret = ioctl(s->fd, CDROM_DRIVE_STATUS, CDSL_CURRENT);
if (ret == CDS_DISC_OK) return ret == CDS_DISC_OK;
return 1;
return 0;
} }
static void cdrom_eject(BlockDriverState *bs, bool eject_flag) static void cdrom_eject(BlockDriverState *bs, bool eject_flag)
@ -2532,7 +2530,7 @@ static int cdrom_reopen(BlockDriverState *bs)
return 0; return 0;
} }
static int cdrom_is_inserted(BlockDriverState *bs) static bool cdrom_is_inserted(BlockDriverState *bs)
{ {
return raw_getlength(bs) > 0; return raw_getlength(bs) > 0;
} }

2
block/raw_bsd.c
View File

@ -154,7 +154,7 @@ static int raw_truncate(BlockDriverState *bs, int64_t offset)
return bdrv_truncate(bs->file->bs, 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); return bdrv_is_inserted(bs->file->bs);
} }

2
include/block/block.h
View File

@ -399,7 +399,7 @@ int bdrv_is_read_only(BlockDriverState *bs);
int bdrv_is_sg(BlockDriverState *bs); int bdrv_is_sg(BlockDriverState *bs);
int bdrv_enable_write_cache(BlockDriverState *bs); int bdrv_enable_write_cache(BlockDriverState *bs);
void bdrv_set_enable_write_cache(BlockDriverState *bs, bool wce); 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); int bdrv_media_changed(BlockDriverState *bs);
void bdrv_lock_medium(BlockDriverState *bs, bool locked); void bdrv_lock_medium(BlockDriverState *bs, bool locked);
void bdrv_eject(BlockDriverState *bs, bool eject_flag); void bdrv_eject(BlockDriverState *bs, bool eject_flag);

2
include/block/block_int.h
View File

@ -212,7 +212,7 @@ struct BlockDriver {
const char *backing_file, const char *backing_fmt); const char *backing_file, const char *backing_fmt);
/* removable device specific */ /* removable device specific */
int (*bdrv_is_inserted)(BlockDriverState *bs); bool (*bdrv_is_inserted)(BlockDriverState *bs);
int (*bdrv_media_changed)(BlockDriverState *bs); int (*bdrv_media_changed)(BlockDriverState *bs);
void (*bdrv_eject)(BlockDriverState *bs, bool eject_flag); void (*bdrv_eject)(BlockDriverState *bs, bool eject_flag);
void (*bdrv_lock_medium)(BlockDriverState *bs, bool locked); void (*bdrv_lock_medium)(BlockDriverState *bs, bool locked);

2
include/sysemu/block-backend.h
View File

@ -130,7 +130,7 @@ int blk_is_sg(BlockBackend *blk);
int blk_enable_write_cache(BlockBackend *blk); int blk_enable_write_cache(BlockBackend *blk);
void blk_set_enable_write_cache(BlockBackend *blk, bool wce); void blk_set_enable_write_cache(BlockBackend *blk, bool wce);
void blk_invalidate_cache(BlockBackend *blk, Error **errp); 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_lock_medium(BlockBackend *blk, bool locked);
void blk_eject(BlockBackend *blk, bool eject_flag); void blk_eject(BlockBackend *blk, bool eject_flag);
int blk_get_flags(BlockBackend *blk); int blk_get_flags(BlockBackend *blk);