[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 15/37] block: Make some BB functions fall back to
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 15/37] block: Make some BB functions fall back to BBRS |
Date: |
Mon, 9 Feb 2015 12:11:15 -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>
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 3ce50ea..8206360 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -834,7 +834,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)
@@ -879,7 +883,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.1.0
- [Qemu-devel] [PATCH v2 10/37] block: Move guest_block_size into BlockBackend, (continued)
- [Qemu-devel] [PATCH v2 10/37] block: Move guest_block_size into BlockBackend, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 09/37] block/quorum: Implement bdrv_is_inserted(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 11/37] block: Remove wr_highest_sector from BlockAcctStats, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 17/37] block: Prepare remaining BB functions for NULL BDS, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 14/37] block: Add BlockBackendRootState, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 18/37] blockdev: Use BB for blockdev-backup transaction, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 16/37] block: Fail requests to empty BlockBackend, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 13/37] block: Move I/O status and error actions into BB, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 15/37] block: Make some BB functions fall back to BBRS,
Max Reitz <=
- [Qemu-devel] [PATCH v2 19/37] block: Add blk_insert_bs(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 21/37] blockdev: Do not create BDS for empty drive, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 24/37] block: Add blk_remove_bs(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 22/37] blockdev: Pull out blockdev option extraction, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 34/37] blockdev: read-only-mode for blockdev-change-medium, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 27/37] blockdev: Add blockdev-remove-medium, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 33/37] hmp: Use blockdev-change-medium for change command, Max Reitz, 2015/02/09