[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v7 09/39] block: Invoke change media CB before NULLi
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v7 09/39] block: Invoke change media CB before NULLing drv |
Date: |
Mon, 19 Oct 2015 17:53:15 +0200 |
In order to handle host device passthrough, some guest device models
may call blk_is_inserted() to check whether the medium is inserted on
the host, when checking the guest tray status.
This tray status is inquired by blk_dev_change_media_cb(); because
bdrv_is_inserted() (invoked by blk_is_inserted()) always returns false
for BDS with drv set to NULL, blk_dev_change_media_cb() should therefore
be called before drv is set to NULL.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
---
block.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index 0f23a98..59a2a62 100644
--- a/block.c
+++ b/block.c
@@ -1912,6 +1912,10 @@ void bdrv_close(BlockDriverState *bs)
bdrv_drain(bs); /* in case flush left pending I/O */
notifier_list_notify(&bs->close_notifiers, bs);
+ if (bs->blk) {
+ blk_dev_change_media_cb(bs->blk, false);
+ }
+
if (bs->drv) {
BdrvChild *child, *next;
@@ -1950,10 +1954,6 @@ void bdrv_close(BlockDriverState *bs)
bs->full_open_options = NULL;
}
- if (bs->blk) {
- blk_dev_change_media_cb(bs->blk, false);
- }
-
QLIST_FOREACH_SAFE(ban, &bs->aio_notifiers, list, ban_next) {
g_free(ban);
}
--
2.6.1
- [Qemu-block] [PATCH v7 00/39] blockdev: BlockBackend and media, Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 01/39] block: Remove host floppy support, Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 02/39] block: Set BDRV_O_INCOMING in bdrv_fill_options(), Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 03/39] blockdev: Allow creation of BDS trees without BB, Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 04/39] iotests: Only create BB if necessary, Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 05/39] block: Make bdrv_is_inserted() return a bool, Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 07/39] block: Make bdrv_is_inserted() recursive, Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 06/39] block: Add blk_is_available(), Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 08/39] block/raw_bsd: Drop raw_is_inserted(), Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 09/39] block: Invoke change media CB before NULLing drv,
Max Reitz <=
- [Qemu-block] [PATCH v7 10/39] hw/block/fdc: Implement tray status, Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 12/39] block: Fix BB AIOCB AioContext without BDS, Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 11/39] hw/usb-storage: Check whether BB is inserted, Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 14/39] block: Remove wr_highest_sector from BlockAcctStats, Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 13/39] block: Move guest_block_size into BlockBackend, Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 15/39] block: Move BlockAcctStats into BlockBackend, Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 17/39] block/throttle-groups: Make incref/decref public, Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 18/39] block: Add BlockBackendRootState, Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 16/39] block: Move I/O status and error actions into BB, Max Reitz, 2015/10/19
- [Qemu-block] [PATCH v7 19/39] block: Make some BB functions fall back to BBRS, Max Reitz, 2015/10/19