[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v6 05/39] block: Make bdrv_is_inserted() return a bo
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v6 05/39] block: Make bdrv_is_inserted() return a bool |
Date: |
Mon, 12 Oct 2015 22:00:08 +0200 |
Make bdrv_is_inserted(), blk_is_inserted(), and the callback
BlockDriver.bdrv_is_inserted() return a bool.
Suggested-by: Eric Blake <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
---
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 0ae3fcf..15a11bf 100644
--- a/block.c
+++ b/block.c
@@ -3130,14 +3130,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 2256551..1db002c 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 afd1c59..c014724 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 63ee911..3c7b413 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);
}
diff --git a/include/block/block.h b/include/block/block.h
index 1520dee..cb3e312 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -399,7 +399,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 c0e6513..40d40df 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -212,7 +212,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.6.1
- [Qemu-block] [PATCH v6 00/39] blockdev: BlockBackend and media, Max Reitz, 2015/10/15
- [Qemu-block] [PATCH v6 01/39] block: Remove host floppy support, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 02/39] block: Set BDRV_O_INCOMING in bdrv_fill_options(), Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 03/39] blockdev: Allow creation of BDS trees without BB, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 05/39] block: Make bdrv_is_inserted() return a bool,
Max Reitz <=
- [Qemu-block] [PATCH v6 04/39] iotests: Only create BB if necessary, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 07/39] block: Make bdrv_is_inserted() recursive, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 08/39] block/raw_bsd: Drop raw_is_inserted(), Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 09/39] block: Invoke change media CB before NULLing drv, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 10/39] hw/block/fdc: Implement tray status, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 11/39] hw/usb-storage: Check whether BB is inserted, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 12/39] block: Fix BB AIOCB AioContext without BDS, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 13/39] block: Move guest_block_size into BlockBackend, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 14/39] block: Remove wr_highest_sector from BlockAcctStats, Max Reitz, 2015/10/12
- [Qemu-block] [PATCH v6 15/39] block: Move BlockAcctStats into BlockBackend, Max Reitz, 2015/10/12