[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 34/39] block: Inquire tray state before tray-move
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v6 34/39] block: Inquire tray state before tray-moved events |
Date: |
Mon, 12 Oct 2015 22:00:37 +0200 |
blk_dev_change_media_cb() is called for all potential tray movements;
however, it is possible to request closing the tray but nothing actually
happening (on a floppy disk drive without a medium).
Thus, the actual tray status should be inquired before sending a
tray-moved event (and an event should be sent whenever the status
changed).
Checking @load is now superfluous; it was necessary because it was
possible to change a medium without having explicitly opened the tray
and closed it again (or it might have been possible, at least). This is
no longer possible, though.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block/block-backend.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index eb7409c..10e4d71 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -429,18 +429,15 @@ void blk_set_dev_ops(BlockBackend *blk, const BlockDevOps
*ops,
void blk_dev_change_media_cb(BlockBackend *blk, bool load)
{
if (blk->dev_ops && blk->dev_ops->change_media_cb) {
- bool tray_was_closed = !blk_dev_is_tray_open(blk);
+ bool tray_was_open, tray_is_open;
+ tray_was_open = blk_dev_is_tray_open(blk);
blk->dev_ops->change_media_cb(blk->dev_opaque, load);
- if (tray_was_closed) {
- /* tray open */
- qapi_event_send_device_tray_moved(blk_name(blk),
- true, &error_abort);
- }
- if (load) {
- /* tray close */
- qapi_event_send_device_tray_moved(blk_name(blk),
- false, &error_abort);
+ tray_is_open = blk_dev_is_tray_open(blk);
+
+ if (tray_was_open != tray_is_open) {
+ qapi_event_send_device_tray_moved(blk_name(blk), tray_is_open,
+ &error_abort);
}
}
}
--
2.6.1
- [Qemu-devel] [PATCH v6 02/39] block: Set BDRV_O_INCOMING in bdrv_fill_options(), (continued)
- [Qemu-devel] [PATCH v6 02/39] block: Set BDRV_O_INCOMING in bdrv_fill_options(), Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 06/39] block: Add blk_is_available(), Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 14/39] block: Remove wr_highest_sector from BlockAcctStats, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 09/39] block: Invoke change media CB before NULLing drv, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 21/39] block: Prepare remaining BB functions for NULL BDS, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 22/39] block: Add blk_insert_bs(), Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 29/39] blockdev: Add blockdev-close-tray, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 27/39] block: Add blk_remove_bs(), Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 28/39] blockdev: Add blockdev-open-tray, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 33/39] blockdev: Implement change with basic operations, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 34/39] block: Inquire tray state before tray-moved events,
Max Reitz <=
- [Qemu-devel] [PATCH v6 35/39] qmp: Introduce blockdev-change-medium, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 36/39] hmp: Use blockdev-change-medium for change command, Max Reitz, 2015/10/15