[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/50] block: Make some BB functions fall back to BB
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 14/50] block: Make some BB functions fall back to BBRS |
Date: |
Mon, 26 Jan 2015 11:02:48 -0500 |
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>
---
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 7be03ee..62be370 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -829,7 +829,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)
@@ -874,7 +878,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;
+ }
}
void blk_set_guest_block_size(BlockBackend *blk, int align)
--
2.1.0
- [Qemu-devel] [PATCH 05/50] block: Fix BB AIOCB AioContext without BDS, (continued)
- [Qemu-devel] [PATCH 05/50] block: Fix BB AIOCB AioContext without BDS, Max Reitz, 2015/01/26
- [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 <=
- [Qemu-devel] [PATCH 06/50] block: Add blk_is_available(), Max Reitz, 2015/01/26
- [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