Message ID | 1442589793-7105-10-git-send-email-mreitz@redhat.com |
---|---|
State | New |
Headers | show |
On 09/18/2015 09:22 AM, Max Reitz wrote: > 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 0 for Stale comment - you just fixed bdrv_is_inserted() to return false rather than 0 in commit 5/38. > 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 <mreitz@redhat.com> > Reviewed-by: Eric Blake <eblake@redhat.com> > Reviewed-by: Alberto Garcia <berto@igalia.com> > --- > block.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) R-b still stands.
diff --git a/block.c b/block.c index c4fa299..661c621 100644 --- a/block.c +++ b/block.c @@ -1916,6 +1916,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; @@ -1958,10 +1962,6 @@ void bdrv_close(BlockDriverState *bs) } } - if (bs->blk) { - blk_dev_change_media_cb(bs->blk, false); - } - /*throttling disk I/O limits*/ if (bs->io_limits_enabled) { bdrv_io_limits_disable(bs);