This fixes a regression introduced by commit 9ca111544.

The first commit is done by Luiz and I've just use it as it is.

The second commit moves the bdrv_dev_change_media_cb() into eject_device(),
called by QMP and HMP eject command, and into qmp_bdrv_open_encrypted(),
called by QMP and HMP change command. These are the only place where I think
that should call the bdrv_dev_change_media_cb() function.

There is no reason to call this function while we are removing the device
from the guest, for example while closing and deleting all devices on shutdown.

Luiz Capitulino (1):
  block: make bdrv_dev_change_media_cb() public

Pavel Hrdina (1):
  block: move the bdrv_dev_change_media_cb()

 block.c               | 11 +----------
 blockdev.c            |  5 +++++
 include/block/block.h |  1 +
 3 files changed, 7 insertions(+), 10 deletions(-)

-- 
1.8.1.4


Reply via email to