[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 09/39] block: Invoke change media CB before NULLi
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v6 09/39] block: Invoke change media CB before NULLing drv |
Date: |
Mon, 12 Oct 2015 22:00:12 +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 363088c..ccdef82 100644
--- a/block.c
+++ b/block.c
@@ -1902,6 +1902,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;
@@ -1940,10 +1944,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-devel] [PATCH v6 32/39] blockdev: Implement eject with basic operations, (continued)
- [Qemu-devel] [PATCH v6 32/39] blockdev: Implement eject with basic operations, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 30/39] blockdev: Add blockdev-remove-medium, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 31/39] blockdev: Add blockdev-insert-medium, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 37/39] blockdev: read-only-mode for blockdev-change-medium, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 38/39] hmp: Add read-only-mode option to change command, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 39/39] iotests: Add test for change-related QMP commands, Max Reitz, 2015/10/12
- Re: [Qemu-devel] [PATCH v6 00/39] blockdev: BlockBackend and media, Kevin Wolf, 2015/10/13
- [Qemu-devel] [PATCH v6 02/39] block: Set BDRV_O_INCOMING in bdrv_fill_options(), Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 06/39] block: Add blk_is_available(), Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 14/39] block: Remove wr_highest_sector from BlockAcctStats, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 09/39] block: Invoke change media CB before NULLing drv,
Max Reitz <=
- [Qemu-devel] [PATCH v6 21/39] block: Prepare remaining BB functions for NULL BDS, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 22/39] block: Add blk_insert_bs(), Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 29/39] blockdev: Add blockdev-close-tray, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 27/39] block: Add blk_remove_bs(), Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 28/39] blockdev: Add blockdev-open-tray, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 33/39] blockdev: Implement change with basic operations, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 34/39] block: Inquire tray state before tray-moved events, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 35/39] qmp: Introduce blockdev-change-medium, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 36/39] hmp: Use blockdev-change-medium for change command, Max Reitz, 2015/10/15