| Message ID | 1465408588-29473-1-git-send-email-clord@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am 08.06.2016 um 19:56 hat Colin Lord geschrieben: > 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> Thanks, applied to the block branch. Kevin
diff --git a/blockdev.c b/blockdev.c index 7dd14b9..8a045d9 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) {
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> --- Reworded commit message to hopefully explain things a little better. As before this is based off my previously submitted patch v3. blockdev.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)