diff options
| author | John Snow <jsnow@redhat.com> | 2016-11-14 11:15:54 -0500 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2016-12-21 09:59:57 -0600 |
| commit | 345f1cd9f6e4f156c7af0098b3d220305037f227 (patch) | |
| tree | 6beff445cbd5ae4e54e0180dd0fbe22f1ecc9c0c | |
| parent | 8d5f2a75702b1975f8f2f2b866bde0b60493e3c3 (diff) | |
| download | qemu-345f1cd9f6e4f156c7af0098b3d220305037f227.tar.gz | |
block-backend: Always notify on blk_eject
blk_eject is only used by scsi-disk and atapi, and in both cases we
only attempt to invoke blk_eject if we have a bona-fide change in
tray state.
The "issue" here is that the tray state does not generate a QMP event
unless there is a medium/BDS attached to the device, so if libvirt et al
are waiting for a tray event to occur from an empty-but-closed drive,
software opening that drive will not emit an event and libvirt will
wait forever.
Change this by modifying blk_eject to always emit an event, instead of
conditionally on a "real" backend eject.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1373264
Reported-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-id: 1478553214-497-2-git-send-email-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
(cherry picked from commit c47ee043dc2cc85da710e87524144a720598c096)
* dropped functional depedenecy on 2d76e724
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | block/block-backend.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index a67a463615..e2cda1c3d5 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1296,6 +1296,11 @@ void blk_eject(BlockBackend *blk, bool eject_flag) if (bs) { bdrv_eject(bs, eject_flag); } + + /* Whether or not we ejected on the backend, + * the frontend experienced a tray event. */ + qapi_event_send_device_tray_moved(blk_name(blk), + eject_flag, &error_abort); } int blk_get_flags(BlockBackend *blk) |