Skip to content

Commit

Permalink
blockdev: clarify error on attempt to open locked tray
Browse files Browse the repository at this point in the history
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: Colin Lord <clord@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
dramborleg authored and kevmw committed Jun 16, 2016
1 parent d46a0bb commit 38a53d5
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions blockdev.c
Expand Up @@ -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;

Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 38a53d5

Please sign in to comment.