From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39159) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c5Gtm-0004C5-VQ for qemu-devel@nongnu.org; Fri, 11 Nov 2016 13:50:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c5Gtl-0003GN-7C for qemu-devel@nongnu.org; Fri, 11 Nov 2016 13:50:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58778) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c5Gtl-0003G8-1r for qemu-devel@nongnu.org; Fri, 11 Nov 2016 13:50:01 -0500 From: John Snow Date: Fri, 11 Nov 2016 13:49:50 -0500 Message-Id: <1478890195-30841-5-git-send-email-jsnow@redhat.com> In-Reply-To: <1478890195-30841-1-git-send-email-jsnow@redhat.com> References: <1478890195-30841-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PULL 4/9] block-backend: Always notify on blk_eject List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com 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 Message-id: 1478553214-497-2-git-send-email-jsnow@redhat.com Signed-off-by: John Snow --- block/block-backend.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index 27a7f6f..efbf398 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1393,13 +1393,14 @@ void blk_eject(BlockBackend *blk, bool eject_flag) if (bs) { bdrv_eject(bs, eject_flag); - - id = blk_get_attached_dev_id(blk); - qapi_event_send_device_tray_moved(blk_name(blk), id, - eject_flag, &error_abort); - g_free(id); - } + + /* Whether or not we ejected on the backend, + * the frontend experienced a tray event. */ + id = blk_get_attached_dev_id(blk); + qapi_event_send_device_tray_moved(blk_name(blk), id, + eject_flag, &error_abort); + g_free(id); } int blk_get_flags(BlockBackend *blk) -- 2.7.4