From 345f1cd9f6e4f156c7af0098b3d220305037f227 Mon Sep 17 00:00:00 2001 From: John Snow Date: Mon, 14 Nov 2016 11:15:54 -0500 Subject: 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 Signed-off-by: John Snow Reviewed-by: Eric Blake Reviewed-by: Kevin Wolf Message-id: 1478553214-497-2-git-send-email-jsnow@redhat.com Signed-off-by: John Snow (cherry picked from commit c47ee043dc2cc85da710e87524144a720598c096) * dropped functional depedenecy on 2d76e724 Signed-off-by: Michael Roth --- block/block-backend.c | 5 +++++ 1 file changed, 5 insertions(+) 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) -- cgit v1.2.1