diff options
| author | Jeff Cody <jcody@redhat.com> | 2012-10-16 15:49:10 -0400 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-10-24 10:26:19 +0200 |
| commit | d5208c45be38ab858db6ec5a5097aa1c1a8ebbc9 (patch) | |
| tree | ce7f91f0ae21e2151d9c5620e03378c535523dd7 /block/commit.c | |
| parent | b1b1d783eabdb6ac4e4578b2c04b0c24483dce77 (diff) | |
| download | focaccia-qemu-d5208c45be38ab858db6ec5a5097aa1c1a8ebbc9.tar.gz focaccia-qemu-d5208c45be38ab858db6ec5a5097aa1c1a8ebbc9.zip | |
block: in commit, determine base image from the top image
This simplifies some code and error checking, and also fixes a bug. bdrv_find_backing_image() should only be passed absolute filenames, or filenames relative to the chain. In the QMP message handler for block commit, when looking up the base do so from the determined top image, so we know it is reachable from top. Some of the error messages put out by block-commit have changed slightly, which causes 2 tests cases for block-commit to fail. This patch updates the test cases to look for the correct error output. Signed-off-by: Jeff Cody <jcody@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/commit.c')
| -rw-r--r-- | block/commit.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/block/commit.c b/block/commit.c index 733c91403c..13d9e82471 100644 --- a/block/commit.c +++ b/block/commit.c @@ -211,15 +211,6 @@ void commit_start(BlockDriverState *bs, BlockDriverState *base, return; } - /* top and base may be valid, but let's make sure that base is reachable - * from top */ - if (bdrv_find_backing_image(top, base->filename) != base) { - error_setg(errp, - "Base (%s) is not reachable from top (%s)", - base->filename, top->filename); - return; - } - overlay_bs = bdrv_find_overlay(bs, top); if (overlay_bs == NULL) { |