[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/50] block: Add blk_is_available()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 06/50] block: Add blk_is_available() |
Date: |
Mon, 26 Jan 2015 11:02:40 -0500 |
blk_is_available() returns true iff the BDS is inserted (which means
blk_bs() is not NULL and bdrv_is_inserted() returns true) and if the
tray of the guest device is closed.
blk_is_inserted() is changed to return true only if blk_bs() is not
NULL.
Signed-off-by: Max Reitz <address@hidden>
---
block/block-backend.c | 7 ++++++-
include/sysemu/block-backend.h | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index 4c40747..4a2428e 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -738,7 +738,12 @@ void blk_invalidate_cache(BlockBackend *blk, Error **errp)
int blk_is_inserted(BlockBackend *blk)
{
- return bdrv_is_inserted(blk->bs);
+ return blk->bs && bdrv_is_inserted(blk->bs);
+}
+
+bool blk_is_available(BlockBackend *blk)
+{
+ return blk_is_inserted(blk) && !blk_dev_is_tray_open(blk);
}
void blk_lock_medium(BlockBackend *blk, bool locked)
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index f39bb5c..f91f3c7 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -127,6 +127,7 @@ 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_available(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.1.0
- Re: [Qemu-devel] [PATCH 05/50] block: Fix BB AIOCB AioContext without BDS, (continued)
- [Qemu-devel] [PATCH 01/50] blockdev: Allow creation of BDS trees without BB, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 03/50] hw/block/fdc: Implement tray status, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 02/50] iotests: Only create BB if necessary, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 13/50] block: Add BlockBackendRootState, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 14/50] block: Make some BB functions fall back to BBRS, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 06/50] block: Add blk_is_available(),
Max Reitz <=
- [Qemu-devel] [PATCH 12/50] block: Move I/O status and error actions into BB, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 11/50] block: Move BlockAcctStats into BlockBackend, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 07/50] block: Make bdrv_is_inserted() recursive, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 09/50] block: Move guest_block_size into BlockBackend, Max Reitz, 2015/01/26