[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 32/38] block: Inquire tray state before tray-move
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v3 32/38] block: Inquire tray state before tray-moved events |
Date: |
Wed, 3 Jun 2015 21:44:13 +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 93c14f9..c0f4a53 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -420,18 +420,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.4.1
- [Qemu-devel] [PATCH v3 26/38] blockdev: Add blockdev-open-tray, (continued)
- [Qemu-devel] [PATCH v3 26/38] blockdev: Add blockdev-open-tray, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 25/38] block: Add blk_remove_bs(), Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 28/38] blockdev: Add blockdev-remove-medium, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 29/38] blockdev: Add blockdev-insert-medium, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 27/38] blockdev: Add blockdev-close-tray, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 30/38] blockdev: Implement eject with basic operations, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 31/38] blockdev: Implement change with basic operations, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 32/38] block: Inquire tray state before tray-moved events,
Max Reitz <=
- [Qemu-devel] [PATCH v3 34/38] hmp: Use blockdev-change-medium for change command, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 33/38] qmp: Introduce blockdev-change-medium, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 35/38] blockdev: read-only-mode for blockdev-change-medium, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 37/38] iotests: More options for VM.add_drive(), Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 36/38] hmp: Add read-only-mode option to change command, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 38/38] iotests: Add test for change-related QMP commands, Max Reitz, 2015/06/03