[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 1/6] block-backend: Always notify on blk_eject
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v2 1/6] block-backend: Always notify on blk_eject |
Date: |
Mon, 7 Nov 2016 16:13:29 -0500 |
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 <address@hidden>
Signed-off-by: John Snow <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 0/6] block-backend: Always notify on blk_eject, John Snow, 2016/11/07
- [Qemu-devel] [PATCH v2 4/6] libqos/ahci: Add ATAPI tray macros, John Snow, 2016/11/07
- [Qemu-devel] [PATCH v2 3/6] libqos/ahci: Support expected errors, John Snow, 2016/11/07
- [Qemu-devel] [PATCH v2 1/6] block-backend: Always notify on blk_eject,
John Snow <=
- [Qemu-devel] [PATCH v2 5/6] libqos/ahci: Add get_sense and test_ready, John Snow, 2016/11/07
- [Qemu-devel] [PATCH v2 2/6] libqtest: add qmp_eventwait_ref, John Snow, 2016/11/07
- [Qemu-devel] [PATCH v2 6/6] ahci-test: add QMP tray test for ATAPI, John Snow, 2016/11/07
- Re: [Qemu-devel] [PATCH v2 0/6] block-backend: Always notify on blk_eject, John Snow, 2016/11/10
- Re: [Qemu-devel] [PATCH v2 0/6] block-backend: Always notify on blk_eject, Kevin Wolf, 2016/11/11