Commit c47ee043 authored by John Snow's avatar John Snow
Browse files

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: default avatarPeter Krempa <pkrempa@redhat.com>
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Message-id: 1478553214-497-2-git-send-email-jsnow@redhat.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent ebde93bf

block/block-backend.c

+7 −6
Original line number Diff line number Diff line
@@ -1393,13 +1393,14 @@ 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. */

    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)