qemublocktest: Add 'basic' tests for commit bitmap handling

In the 'basic' case we have few bitmaps in only the top layer. Simulate
commit into the backing of the top layer and also 2 levels deep.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Peter Krempa 2020-05-29 13:01:55 +02:00
parent 20a7abc2d2
commit 79bc7c1828
4 changed files with 295 additions and 0 deletions

View File

@ -1358,6 +1358,10 @@ mymain(void)
TEST_BITMAP_BLOCKCOMMIT("empty", 1, 2, "empty");
TEST_BITMAP_BLOCKCOMMIT("basic-1-2", 1, 2, "basic");
TEST_BITMAP_BLOCKCOMMIT("basic-1-3", 1, 3, "basic");
TEST_BITMAP_BLOCKCOMMIT("basic-2-3", 2, 3, "basic");
cleanup:
qemuTestDriverFree(&driver);
VIR_FREE(capslatest_x86_64);

View File

@ -0,0 +1,145 @@
merge bitmpas:
[
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-2-format",
"name": "a",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-2-format",
"target": "a",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "a"
},
{
"node": "libvirt-2-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-2-format",
"name": "b",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-2-format",
"target": "b",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "b"
},
{
"node": "libvirt-2-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-2-format",
"name": "c",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-2-format",
"target": "c",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "c"
},
{
"node": "libvirt-2-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-2-format",
"name": "d",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-2-format",
"target": "d",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "d"
},
{
"node": "libvirt-2-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-2-format",
"name": "current",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-2-format",
"target": "current",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "current"
},
{
"node": "libvirt-2-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-remove",
"data": {
"node": "libvirt-2-format",
"name": "libvirt-tmp-activewrite"
}
}
]

View File

@ -0,0 +1,145 @@
merge bitmpas:
[
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-3-format",
"name": "a",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "a",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "a"
},
{
"node": "libvirt-3-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-3-format",
"name": "b",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "b",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "b"
},
{
"node": "libvirt-3-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-3-format",
"name": "c",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "c",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "c"
},
{
"node": "libvirt-3-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-3-format",
"name": "d",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "d",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "d"
},
{
"node": "libvirt-3-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-3-format",
"name": "current",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "current",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "current"
},
{
"node": "libvirt-3-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-remove",
"data": {
"node": "libvirt-3-format",
"name": "libvirt-tmp-activewrite"
}
}
]

View File

@ -0,0 +1 @@
merge bitmpas: