[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 30/50] blockdev: Check BB validity in change-backing
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 30/50] blockdev: Check BB validity in change-backing-file |
Date: |
Mon, 26 Jan 2015 11:03:04 -0500 |
Call blk_is_available() before using blk_bs() to obtain the root
BlockDriverState behind the BlockBackend.
Signed-off-by: Max Reitz <address@hidden>
---
blockdev.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 4bd52b8..7f4470f 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2821,7 +2821,8 @@ void qmp_change_backing_file(const char *device,
const char *backing_file,
Error **errp)
{
- BlockDriverState *bs = NULL;
+ BlockBackend *blk;
+ BlockDriverState *bs;
AioContext *aio_context;
BlockDriverState *image_bs = NULL;
Error *local_err = NULL;
@@ -2830,15 +2831,21 @@ void qmp_change_backing_file(const char *device,
int ret;
/* find the top layer BDS of the chain */
- bs = bdrv_find(device);
- if (!bs) {
+ blk = blk_by_name(device);
+ if (!blk) {
error_set(errp, QERR_DEVICE_NOT_FOUND, device);
return;
}
- aio_context = bdrv_get_aio_context(bs);
+ aio_context = blk_get_aio_context(blk);
aio_context_acquire(aio_context);
+ if (!blk_is_available(blk)) {
+ error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, device);
+ goto out;
+ }
+ bs = blk_bs(blk);
+
image_bs = bdrv_lookup_bs(NULL, image_node_name, &local_err);
if (local_err) {
error_propagate(errp, local_err);
--
2.1.0
- [Qemu-devel] [PATCH 25/50] blockdev: Check BB validity in block-commit, (continued)
- [Qemu-devel] [PATCH 25/50] blockdev: Check BB validity in block-commit, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 27/50] blockdev: Check BB validity in blockdev-backup, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 24/50] blockdev: Check BB validity in block-stream, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 28/50] blockdev: Check BB validity in drive-mirror, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 29/50] blockdev: Check BB validity in find_block_job(), Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 34/50] blockdev: Do not create BDS for empty drive, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 26/50] blockdev: Check BB validity in drive-backup, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 32/50] blockdev: Check BB validity in eject and change, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 31/50] block: Add blk_insert_bs(), Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 33/50] blockdev: Respect NULL BDS in do_drive_del(), Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 30/50] blockdev: Check BB validity in change-backing-file,
Max Reitz <=
- [Qemu-devel] [PATCH 37/50] block: Add blk_remove_bs(), Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 36/50] blockdev: Allow more options for BB-less BDS tree, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 35/50] blockdev: Pull out blockdev option extraction, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 43/50] blockdev: Implement change with basic operations, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 44/50] block: Inquire tray state before tray-moved events, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 39/50] blockdev: Add blockdev-close-tray, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 38/50] blockdev: Add blockdev-open-tray, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 40/50] blockdev: Add blockdev-remove-medium, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 49/50] iotests: More options for VM.add_drive(), Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 42/50] blockdev: Implement eject with basic operations, Max Reitz, 2015/01/26