提交 38a53d50 编写于 作者: C Colin Lord 提交者: Kevin Wolf

blockdev: clarify error on attempt to open locked tray

When opening a device with a locked tray, gives an error explaining the
device tray is locked and that the user should wait and try again. This
is less confusing than the previous error, which simply stated that the
tray was locked.
Signed-off-by: NColin Lord <clord@redhat.com>
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
上级 d46a0bb2
......@@ -2544,6 +2544,7 @@ void qmp_blockdev_change_medium(const char *device, const char *filename,
BlockBackend *blk;
BlockDriverState *medium_bs = NULL;
int bdrv_flags;
int rc;
QDict *options = NULL;
Error *err = NULL;
......@@ -2598,11 +2599,13 @@ void qmp_blockdev_change_medium(const char *device, const char *filename,
goto fail;
}
qmp_blockdev_open_tray(device, false, false, &err);
if (err) {
rc = do_open_tray(device, false, &err);
if (rc && rc != -ENOSYS) {
error_propagate(errp, err);
goto fail;
}
error_free(err);
err = NULL;
qmp_x_blockdev_remove_medium(device, &err);
if (err) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册