[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 04/48] block/qapi: Emit tray_open only if there is a
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 04/48] block/qapi: Emit tray_open only if there is a tray |
Date: |
Fri, 29 Jan 2016 18:37:10 +0100 |
From: Max Reitz <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qapi.c | 2 +-
qapi/block-core.json | 4 ++--
tests/qemu-iotests/067.out | 4 ----
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/block/qapi.c b/block/qapi.c
index a49c118..bbe0c9d 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -300,7 +300,7 @@ static void bdrv_query_info(BlockBackend *blk, BlockInfo
**p_info,
info->locked = blk_dev_is_medium_locked(blk);
info->removable = blk_dev_has_removable_media(blk);
- if (blk_dev_has_removable_media(blk)) {
+ if (blk_dev_has_tray(blk)) {
info->has_tray_open = true;
info->tray_open = blk_dev_is_tray_open(blk);
}
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 40239bf..628a41d 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -382,8 +382,8 @@
# @locked: True if the guest has locked this device from having its media
# removed
#
-# @tray_open: #optional True if the device has a tray and it is open
-# (only present if removable is true)
+# @tray_open: #optional True if the device's tray is open
+# (only present if it has a tray)
#
# @dirty-bitmaps: #optional dirty bitmaps information (only present if the
# driver has one or more dirty bitmaps) (Since 2.0)
diff --git a/tests/qemu-iotests/067.out b/tests/qemu-iotests/067.out
index 27ad56f..ae3fccb 100644
--- a/tests/qemu-iotests/067.out
+++ b/tests/qemu-iotests/067.out
@@ -169,7 +169,6 @@ Testing: -drive
file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk
"file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false
},
- "tray_open": false,
"type": "unknown"
}
]
@@ -289,7 +288,6 @@ Testing:
"file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false
},
- "tray_open": false,
"type": "unknown"
}
]
@@ -410,7 +408,6 @@ Testing:
"file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false
},
- "tray_open": false,
"type": "unknown"
}
]
@@ -501,7 +498,6 @@ Testing:
"file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false
},
- "tray_open": false,
"type": "unknown"
}
]
--
1.8.3.1
- [Qemu-block] [PULL 00/48] Block patches, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 01/48] block: Add blk_dev_has_tray(), Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 04/48] block/qapi: Emit tray_open only if there is a tray,
Kevin Wolf <=
- [Qemu-block] [PULL 05/48] vmdk: Fix converting to streamOptimized, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 03/48] Revert "hw/block/fdc: Implement tray status", Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 02/48] blockdev: Fix 'change' for slot devices, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 06/48] iotests: Limit supported formats for 118, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 07/48] nbd: client_close on error in nbd_co_client_start, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 11/48] iotests: Make _filter_nbd drop log lines, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 09/48] iotests: Change coding style of _filter_nbd in 083, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 08/48] iotests: Rename filter_nbd to _filter_nbd in 083, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 12/48] iotests: Make _filter_nbd support more URL types, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 10/48] iotests: Move _filter_nbd into common.filter, Kevin Wolf, 2016/01/29