summaryrefslogtreecommitdiff
path: root/tests/qemu-iotests/141
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2017-01-25 19:16:34 +0100
committerKevin Wolf <kwolf@redhat.com>2017-02-28 20:47:46 +0100
commit4ef85a9c233936d9ac1400d67b066353a6e9f32f (patch)
tree8808ae95cd43da22b6da5d6d6f424aa1c299d028 /tests/qemu-iotests/141
parentbbc02b90bcba371818dbffec89933072f9406945 (diff)
downloadqemu-4ef85a9c233936d9ac1400d67b066353a6e9f32f.tar.gz
mirror: Use real permissions in mirror/active commit block job
The mirror block job is mainly used for two different scenarios: Mirroring to an otherwise unused, independent target node, or for active commit where the target node is part of the backing chain of the source. Similarly to the commit block job patch, we need to insert a new filter node to keep the permissions correct during active commit. Note that one change this implies is that job->blk points to mirror_top_bs as its root now, and mirror_top_bs (rather than the actual source node) contains the bs->job pointer. This requires qemu-img commit to get the job by name now rather than just taking bs->job. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Acked-by: Fam Zheng <famz@redhat.com> Acked-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/141')
-rwxr-xr-xtests/qemu-iotests/1412
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
index 3ba79f027a..6d8f0a1a84 100755
--- a/tests/qemu-iotests/141
+++ b/tests/qemu-iotests/141
@@ -67,7 +67,7 @@ test_blockjob()
_send_qemu_cmd $QEMU_HANDLE \
"{'execute': 'x-blockdev-del',
'arguments': {'node-name': 'drv0'}}" \
- 'error'
+ 'error' | _filter_generated_node_ids
_send_qemu_cmd $QEMU_HANDLE \
"{'execute': 'block-job-cancel',