[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 18/38] block: Make some BB functions fall back to
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v5 18/38] block: Make some BB functions fall back to BBRS |
Date: |
Fri, 18 Sep 2015 17:22:53 +0200 |
If there is no BDS tree attached to a BlockBackend, functions that can
do so should fall back to the BlockBackendRootState structure (which are
blk_is_read_only() and blk_get_flags(), because the read-only status and
the "open flags" are part of the BBRS).
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block/block-backend.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index 9590be5..417374f 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -852,7 +852,11 @@ void blk_error_action(BlockBackend *blk, BlockErrorAction
action,
int blk_is_read_only(BlockBackend *blk)
{
- return bdrv_is_read_only(blk->bs);
+ if (blk->bs) {
+ return bdrv_is_read_only(blk->bs);
+ } else {
+ return blk->root_state.read_only;
+ }
}
int blk_is_sg(BlockBackend *blk)
@@ -897,7 +901,11 @@ void blk_eject(BlockBackend *blk, bool eject_flag)
int blk_get_flags(BlockBackend *blk)
{
- return bdrv_get_flags(blk->bs);
+ if (blk->bs) {
+ return bdrv_get_flags(blk->bs);
+ } else {
+ return blk->root_state.open_flags;
+ }
}
int blk_get_max_transfer_length(BlockBackend *blk)
--
2.5.2
- [Qemu-devel] [PATCH v5 12/38] block: Fix BB AIOCB AioContext without BDS, (continued)
- [Qemu-devel] [PATCH v5 15/38] block: Move BlockAcctStats into BlockBackend, Max Reitz, 2015/09/18
- [Qemu-devel] [PATCH v5 16/38] block: Move I/O status and error actions into BB, Max Reitz, 2015/09/18
- [Qemu-devel] [PATCH v5 17/38] block: Add BlockBackendRootState, Max Reitz, 2015/09/18
- [Qemu-devel] [PATCH v5 18/38] block: Make some BB functions fall back to BBRS,
Max Reitz <=
- [Qemu-devel] [PATCH v5 19/38] block: Fail requests to empty BlockBackend, Max Reitz, 2015/09/18
[Qemu-devel] [PATCH v5 20/38] block: Prepare remaining BB functions for NULL BDS, Max Reitz, 2015/09/18
[Qemu-devel] [PATCH v5 21/38] block: Add blk_insert_bs(), Max Reitz, 2015/09/18