[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 08/37] block: Make bdrv_is_inserted() recursive
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 08/37] block: Make bdrv_is_inserted() recursive |
Date: |
Mon, 9 Feb 2015 12:11:08 -0500 |
If bdrv_is_inserted() is called on the top level BDS, it should make
sure all nodes in the BDS tree are actually inserted.
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index ee7dfba..dafa4b7 100644
--- a/block.c
+++ b/block.c
@@ -5237,10 +5237,9 @@ bool bdrv_is_inserted(BlockDriverState *bs)
if (!drv) {
return false;
}
- if (!drv->bdrv_is_inserted) {
- return true;
- }
- return drv->bdrv_is_inserted(bs);
+ return (!drv->bdrv_is_inserted || drv->bdrv_is_inserted(bs)) &&
+ (!bs->file || bdrv_is_inserted(bs->file)) &&
+ (!bs->backing_hd || bdrv_is_inserted(bs->backing_hd));
}
/**
--
2.1.0
- [Qemu-devel] [PATCH v2 06/37] block: Make bdrv_is_inserted() return a bool, (continued)
- [Qemu-devel] [PATCH v2 06/37] block: Make bdrv_is_inserted() return a bool, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 07/37] block: Add blk_is_available(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 05/37] block: Fix BB AIOCB AioContext without BDS, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 01/37] blockdev: Allow creation of BDS trees without BB, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 03/37] hw/block/fdc: Implement tray status, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 02/37] iotests: Only create BB if necessary, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 08/37] block: Make bdrv_is_inserted() recursive,
Max Reitz <=
- [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