diff options
| author | Colin Lord <clord@redhat.com> | 2016-06-08 13:56:28 -0400 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-06-16 15:19:55 +0200 |
| commit | 38a53d506be5efc83a33498948d8e6ba838dd836 (patch) | |
| tree | eca18f7b6d8e068cccccc0520da32d49fbe9f690 | |
| parent | d46a0bb24d6061c1eadcf1136fa73dc7c4ac267d (diff) | |
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: Colin Lord <clord@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | blockdev.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/blockdev.c b/blockdev.c index 7fd515a4fa..11177b4fcc 100644 --- a/blockdev.c +++ b/blockdev.c @@ -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) { |