From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJ1BD-0006Pt-VD for qemu-devel@nongnu.org; Tue, 12 Jan 2016 10:48:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJ1BC-0006qk-UH for qemu-devel@nongnu.org; Tue, 12 Jan 2016 10:48:19 -0500 From: Max Reitz Date: Tue, 12 Jan 2016 16:47:54 +0100 Message-Id: <1452613674-12248-5-git-send-email-mreitz@redhat.com> In-Reply-To: <1452613674-12248-1-git-send-email-mreitz@redhat.com> References: <1452613674-12248-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] block/qapi: Emit tray_open only if there is a tray List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: Kevin Wolf , Peter Maydell , Markus Armbruster , qemu-devel@nongnu.org, Max Reitz , John Snow Signed-off-by: Max Reitz --- block/qapi.c | 2 +- tests/qemu-iotests/067.out | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 58d3975..12a0f25 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -299,7 +299,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/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" } ] -- 2.7.0