mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block/qapi: Emit tray_open only if there is a tray

Browse Source 
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-id: 1454096953-31773-5-git-send-email-mreitz@redhat.com
This commit is contained in:
Max Reitz 2016-01-29 20:49:13 +01:00
parent abb3e55b5b
commit 327032ce74
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/qapi.c
View File

@ -300,7 +300,7 @@ static void bdrv_query_info(BlockBackend *blk, BlockInfo **p_info,
info->locked = blk_dev_is_medium_locked(blk); info->locked = blk_dev_is_medium_locked(blk);
info->removable = blk_dev_has_removable_media(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->has_tray_open = true;
info->tray_open = blk_dev_is_tray_open(blk); info->tray_open = blk_dev_is_tray_open(blk);
} }

4
qapi/block-core.json
View File

@ -382,8 +382,8 @@
# @locked: True if the guest has locked this device from having its media # @locked: True if the guest has locked this device from having its media
# removed # removed
# #
# @tray_open: #optional True if the device has a tray and it is open # @tray_open: #optional True if the device's tray is open
# (only present if removable is true) # (only present if it has a tray)
# #
# @dirty-bitmaps: #optional dirty bitmaps information (only present if the # @dirty-bitmaps: #optional dirty bitmaps information (only present if the
# driver has one or more dirty bitmaps) (Since 2.0) # driver has one or more dirty bitmaps) (Since 2.0)

4
tests/qemu-iotests/067.out
View File

@ -169,7 +169,6 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk
"file": "TEST_DIR/t.qcow2", "file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false "encryption_key_missing": false
}, },
"tray_open": false,
"type": "unknown" "type": "unknown"
} }
] ]
@ -289,7 +288,6 @@ Testing:
"file": "TEST_DIR/t.qcow2", "file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false "encryption_key_missing": false
}, },
"tray_open": false,
"type": "unknown" "type": "unknown"
} }
] ]
@ -410,7 +408,6 @@ Testing:
"file": "TEST_DIR/t.qcow2", "file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false "encryption_key_missing": false
}, },
"tray_open": false,
"type": "unknown" "type": "unknown"
} }
] ]
@ -501,7 +498,6 @@ Testing:
"file": "TEST_DIR/t.qcow2", "file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false "encryption_key_missing": false
}, },
"tray_open": false,
"type": "unknown" "type": "unknown"
} }
] ]