diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2017-02-20 12:46:42 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-02-28 20:47:51 +0100 |
| commit | b2c2832c6140cfe3ddc0de2d77eeb0b77dea8fd3 (patch) | |
| tree | a8887134fb47b8dbd8c23a0cd4da55bc979ecbbb /tests/qemu-iotests/085.out | |
| parent | 12fa4af61fb2a08b156134c3b6717534c637c995 (diff) | |
| download | qemu-b2c2832c6140cfe3ddc0de2d77eeb0b77dea8fd3.tar.gz | |
block: Add Error parameter to bdrv_append()
Aborting on error in bdrv_append() isn't correct. This patch fixes it
and lets the callers handle failures.
Test case 085 needs a reference output update. This is caused by the
reversed order of bdrv_set_backing_hd() and change_parent_backing_link()
in bdrv_append(): When the backing file of the new node is set, the
parent nodes are still pointing to the old top, so the backing blocker
is now initialised with the node name rather than the BlockBackend name.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/085.out')
| -rw-r--r-- | tests/qemu-iotests/085.out | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemu-iotests/085.out b/tests/qemu-iotests/085.out index 08e4bb7218..182acb42cf 100644 --- a/tests/qemu-iotests/085.out +++ b/tests/qemu-iotests/085.out @@ -74,7 +74,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/ === Invalid command - snapshot node used as backing hd === -{"error": {"class": "GenericError", "desc": "Node 'snap_11' is busy: node is used as backing hd of 'virtio0'"}} +{"error": {"class": "GenericError", "desc": "Node 'snap_11' is busy: node is used as backing hd of 'snap_12'"}} === Invalid command - snapshot node has a backing image === |