]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commit
block: in commit, determine base image from the top image
authorJeff Cody <jcody@redhat.com>
Tue, 16 Oct 2012 19:49:10 +0000 (15:49 -0400)
committerKevin Wolf <kwolf@redhat.com>
Wed, 24 Oct 2012 08:26:19 +0000 (10:26 +0200)
commitd5208c45be38ab858db6ec5a5097aa1c1a8ebbc9
treece7f91f0ae21e2151d9c5620e03378c535523dd7
parentb1b1d783eabdb6ac4e4578b2c04b0c24483dce77
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>
block/commit.c
blockdev.c
tests/qemu-iotests/040