[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 19/39] block: Make some BB functions fall back to
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v6 19/39] block: Make some BB functions fall back to BBRS |
Date: |
Mon, 12 Oct 2015 22:00:22 +0200 |
If there is no BDS tree attached to a BlockBackend, functions that can
do so should fall back to the BlockBackendRootState structure.
Signed-off-by: Max Reitz <address@hidden>
---
block/block-backend.c | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index 6a3f0c7..d790870 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -872,7 +872,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)
@@ -882,12 +886,24 @@ int blk_is_sg(BlockBackend *blk)
int blk_enable_write_cache(BlockBackend *blk)
{
- return bdrv_enable_write_cache(blk->bs);
+ if (blk->bs) {
+ return bdrv_enable_write_cache(blk->bs);
+ } else {
+ return !!(blk->root_state.open_flags & BDRV_O_CACHE_WB);
+ }
}
void blk_set_enable_write_cache(BlockBackend *blk, bool wce)
{
- bdrv_set_enable_write_cache(blk->bs, wce);
+ if (blk->bs) {
+ bdrv_set_enable_write_cache(blk->bs, wce);
+ } else {
+ if (wce) {
+ blk->root_state.open_flags |= BDRV_O_CACHE_WB;
+ } else {
+ blk->root_state.open_flags &= ~BDRV_O_CACHE_WB;
+ }
+ }
}
void blk_invalidate_cache(BlockBackend *blk, Error **errp)
@@ -917,7 +933,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.6.1
- [Qemu-devel] [PATCH v6 05/39] block: Make bdrv_is_inserted() return a bool, (continued)
- [Qemu-devel] [PATCH v6 05/39] block: Make bdrv_is_inserted() return a bool, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 07/39] block: Make bdrv_is_inserted() recursive, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 08/39] block/raw_bsd: Drop raw_is_inserted(), Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 10/39] hw/block/fdc: Implement tray status, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 11/39] hw/usb-storage: Check whether BB is inserted, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 12/39] block: Fix BB AIOCB AioContext without BDS, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 13/39] block: Move guest_block_size into BlockBackend, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 15/39] block: Move BlockAcctStats into BlockBackend, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 16/39] block: Move I/O status and error actions into BB, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 17/39] block/throttle-groups: Make incref/decref public, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 19/39] block: Make some BB functions fall back to BBRS,
Max Reitz <=
- [Qemu-devel] [PATCH v6 18/39] block: Add BlockBackendRootState, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 20/39] block: Fail requests to empty BlockBackend, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 24/39] blockdev: Do not create BDS for empty drive, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 23/39] block: Prepare for NULL BDS, Max Reitz, 2015/10/12