[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 06/39] blockdev: clarify error on attempt to open loc
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 06/39] blockdev: clarify error on attempt to open locked tray |
Date: |
Thu, 16 Jun 2016 16:07:55 +0200 |
From: Colin Lord <address@hidden>
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 <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
blockdev.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 7fd515a..11177b4 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) {
--
1.8.3.1
- [Qemu-block] [PULL 00/39] Block layer patches, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 04/39] qcow2: Use bytes instead of sectors for QCowL2Meta, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 01/39] qcow2: Work with bytes in qcow2_get_cluster_offset(), Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 02/39] qcow2: Implement .bdrv_co_preadv(), Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 08/39] m25p80: fix test on blk_pread() return value, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 03/39] qcow2: Make copy_sectors() byte based, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 05/39] qcow2: Implement .bdrv_co_pwritev(), Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 09/39] qemu-img bench: Fix uninitialised writethrough mode, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 07/39] hmp: acquire aio_context in hmp_qemu_io, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 06/39] blockdev: clarify error on attempt to open locked tray,
Kevin Wolf <=
- [Qemu-block] [PULL 14/39] block: Prepare bdrv_aligned_preadv() for byte-aligned requests, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 13/39] block: Byte-based bdrv_co_do_copy_on_readv(), Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 12/39] block: drop support for using qcow[2] encryption with system emulators, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 16/39] raw-posix: Switch to bdrv_co_* interfaces, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 23/39] block: Allow .bdrv_load/save_vmstate() to return 0/-errno, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 19/39] linux-aio: Cancel BH if not needed, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 21/39] block: Introduce bdrv_preadv(), Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 17/39] raw-posix: Implement .bdrv_co_preadv/pwritev, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 15/39] block: Prepare bdrv_aligned_pwritev() for byte-aligned requests, Kevin Wolf, 2016/06/16
- [Qemu-block] [PULL 10/39] block: Avoid bogus flags during mirroring, Kevin Wolf, 2016/06/16