On 09.07.19 00:05, John Snow wrote: > From: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> > > Test persistent bitmap copying with and without removal of original > bitmap. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> > Signed-off-by: John Snow <js...@redhat.com> > --- > tests/qemu-iotests/254 | 30 +++++++++++++- > tests/qemu-iotests/254.out | 82 ++++++++++++++++++++++++++++++++++++++ > 2 files changed, 110 insertions(+), 2 deletions(-) > > diff --git a/tests/qemu-iotests/254 b/tests/qemu-iotests/254 > index 8edba91c5d..9a57bccc26 100755 > --- a/tests/qemu-iotests/254 > +++ b/tests/qemu-iotests/254
[...]
> @@ -39,16 +43,38 @@ vm.qmp_log('transaction', indent=2, actions=[
> {'type': 'blockdev-snapshot-sync',
> 'data': {'device': 'drive0', 'snapshot-file': top,
> 'snapshot-node-name': 'snap'}},
> +
> + # copy non-persistent bitmap0
> {'type': 'block-dirty-bitmap-add',
> 'data': {'node': 'snap', 'name': 'bitmap0'}},
> {'type': 'block-dirty-bitmap-merge',
> 'data': {'node': 'snap', 'target': 'bitmap0',
> - 'bitmaps': [{'node': 'base', 'name': 'bitmap0'}]}}
> + 'bitmaps': [{'node': 'base', 'name': 'bitmap0'}]}},
> +
> + # copy persistent bitmap1, original will be saved to base image
> + {'type': 'block-dirty-bitmap-add',
> + 'data': {'node': 'snap', 'name': 'bitmap1', 'persistent': True}},
> + {'type': 'block-dirty-bitmap-merge',
> + 'data': {'node': 'snap', 'target': 'bitmap1',
> + 'bitmaps': [{'node': 'base', 'name': 'bitmap1'}]}},
> +
> + # move persistent bitmap1, original will be removed and not saved
*bitmap2
Reviewed-by: Max Reitz <mre...@redhat.com>
> + # to base image
> + {'type': 'block-dirty-bitmap-add',
> + 'data': {'node': 'snap', 'name': 'bitmap2', 'persistent': True}},
> + {'type': 'block-dirty-bitmap-merge',
> + 'data': {'node': 'snap', 'target': 'bitmap2',
> + 'bitmaps': [{'node': 'base', 'name': 'bitmap2'}]}},
> + {'type': 'block-dirty-bitmap-remove',
> + 'data': {'node': 'base', 'name': 'bitmap2'}}
> ], filters=[iotests.filter_qmp_testfiles])
signature.asc
Description: OpenPGP digital signature
