Commit 327032ce authored by Max Reitz's avatar Max Reitz
Browse files

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



Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarAlberto Garcia <berto@igalia.com>
Message-id: 1454096953-31773-5-git-send-email-mreitz@redhat.com
parent abb3e55b

block/qapi.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }

qapi/block-core.json

+2 −2
Original line number Diff line number Diff line
@@ -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)

tests/qemu-iotests/067.out

+0 −4
Original line number Diff line number Diff line
@@ -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"

        }

    ]