External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-05 04:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemublocktest: Replace 'snapshots' bitmap detection test case data

Browse Source 
Use test data which conforms to the new semantics which changed in the
previous patch.

The test data was created by the same set of commands as originally in
commit 0b27b655b1

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 12:46:27 +02:00
parent de32397007
commit ff00fa228d
2 changed files with 592 additions and 811 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

520
tests/qemublocktestdata/bitmap/snapshots.json
View File

@ -3,150 +3,17 @@
"iops_rd": 0, "iops_rd": 0,
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"backing-image": {
"backing-image": {
"backing-image": {
"backing-image": {
"virtual-size": 10485760,
"filename": "/tmp/pull4.qcow2",
"cluster-size": 65536,
"format": "qcow2",
"actual-size": 208896,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"bitmaps": [
{
"flags": [
"auto"
],
"name": "a",
"granularity": 65536
}
],
"refcount-bits": 16,
"corrupt": false
}
},
"dirty-flag": false
},
"backing-filename-format": "qcow2", "backing-filename-format": "qcow2",
"virtual-size": 10485760, "virtual-size": 104857600,
"filename": "/tmp/pull4.1575911522", "filename": "/tmp/bitmaps.1591792950",
"cluster-size": 65536, "cluster-size": 65536,
"format": "qcow2", "format": "qcow2",
"actual-size": 208896, "actual-size": 225280,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"bitmaps": [
{
"flags": [
"auto"
],
"name": "a",
"granularity": 65536
}
],
"refcount-bits": 16,
"corrupt": false
}
},
"full-backing-filename": "/tmp/pull4.qcow2",
"backing-filename": "/tmp/pull4.qcow2",
"dirty-flag": false
},
"backing-filename-format": "qcow2",
"virtual-size": 10485760,
"filename": "/tmp/pull4.1575911527",
"cluster-size": 65536,
"format": "qcow2",
"actual-size": 217088,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"bitmaps": [
{
"flags": [
"auto"
],
"name": "c",
"granularity": 65536
},
{
"flags": [
],
"name": "b",
"granularity": 65536
},
{
"flags": [
],
"name": "a",
"granularity": 65536
}
],
"refcount-bits": 16,
"corrupt": false
}
},
"full-backing-filename": "/tmp/pull4.1575911522",
"backing-filename": "/tmp/pull4.1575911522",
"dirty-flag": false
},
"backing-filename-format": "qcow2",
"virtual-size": 10485760,
"filename": "/tmp/pull4.1575911540",
"cluster-size": 65536,
"format": "qcow2",
"actual-size": 212992,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"bitmaps": [
{
"flags": [
"auto"
],
"name": "d",
"granularity": 65536
},
{
"flags": [
],
"name": "c",
"granularity": 65536
}
],
"refcount-bits": 16,
"corrupt": false
}
},
"full-backing-filename": "/tmp/pull4.1575911527",
"backing-filename": "/tmp/pull4.1575911527",
"dirty-flag": false
},
"backing-filename-format": "qcow2",
"virtual-size": 10485760,
"filename": "/tmp/pull4.1575911550",
"cluster-size": 65536,
"format": "qcow2",
"actual-size": 212992,
"format-specific": { "format-specific": {
"type": "qcow2", "type": "qcow2",
"data": { "data": {
"compat": "1.1", "compat": "1.1",
"compression-type": "zlib",
"lazy-refcounts": false, "lazy-refcounts": false,
"bitmaps": [ "bitmaps": [
{ {
@ -159,7 +26,32 @@
}, },
{ {
"flags": [ "flags": [
"in-use" "in-use",
"auto"
],
"name": "c",
"granularity": 65536
},
{
"flags": [
"in-use",
"auto"
],
"name": "b",
"granularity": 65536
},
{
"flags": [
"in-use",
"auto"
],
"name": "a",
"granularity": 65536
},
{
"flags": [
"in-use",
"auto"
], ],
"name": "d", "name": "d",
"granularity": 65536 "granularity": 65536
@ -169,26 +61,53 @@
"corrupt": false "corrupt": false
} }
}, },
"full-backing-filename": "/tmp/pull4.1575911540", "full-backing-filename": "/tmp/bitmaps.1591792938",
"backing-filename": "/tmp/pull4.1575911540", "backing-filename": "/tmp/bitmaps.1591792938",
"dirty-flag": false "dirty-flag": false
}, },
"iops_wr": 0, "iops_wr": 0,
"ro": false, "ro": false,
"node-name": "libvirt-1-format", "node-name": "libvirt-1-format",
"backing_file_depth": 4, "backing_file_depth": 0,
"drv": "qcow2", "drv": "qcow2",
"iops": 0, "iops": 0,
"bps_wr": 0, "bps_wr": 0,
"write_threshold": 0, "write_threshold": 0,
"backing_file": "/tmp/pull4.1575911540", "backing_file": "/tmp/bitmaps.1591792938",
"dirty-bitmaps": [ "dirty-bitmaps": [
{ {
"name": "d", "name": "d",
"recording": false, "recording": true,
"persistent": true, "persistent": true,
"busy": false, "busy": false,
"status": "disabled", "status": "active",
"granularity": 65536,
"count": 0
},
{
"name": "a",
"recording": true,
"persistent": true,
"busy": false,
"status": "active",
"granularity": 65536,
"count": 0
},
{
"name": "b",
"recording": true,
"persistent": true,
"busy": false,
"status": "active",
"granularity": 65536,
"count": 0
},
{
"name": "c",
"recording": true,
"persistent": true,
"busy": false,
"status": "active",
"granularity": 65536, "granularity": 65536,
"count": 0 "count": 0
}, },
@ -210,17 +129,17 @@
"direct": false, "direct": false,
"writeback": true "writeback": true
}, },
"file": "/tmp/pull4.1575911550", "file": "/tmp/bitmaps.1591792950",
"encryption_key_missing": false "encryption_key_missing": false
}, },
{ {
"iops_rd": 0, "iops_rd": 0,
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"virtual-size": 393728, "virtual-size": 590336,
"filename": "/tmp/pull4.1575911550", "filename": "/tmp/bitmaps.1591792950",
"format": "file", "format": "file",
"actual-size": 212992, "actual-size": 225280,
"dirty-flag": false "dirty-flag": false
}, },
"iops_wr": 0, "iops_wr": 0,
@ -239,121 +158,24 @@
"direct": false, "direct": false,
"writeback": true "writeback": true
}, },
"file": "/tmp/pull4.1575911550", "file": "/tmp/bitmaps.1591792950",
"encryption_key_missing": false "encryption_key_missing": false
}, },
{ {
"iops_rd": 0, "iops_rd": 0,
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"backing-image": {
"backing-image": {
"backing-image": {
"virtual-size": 10485760,
"filename": "/tmp/pull4.qcow2",
"cluster-size": 65536,
"format": "qcow2",
"actual-size": 208896,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"bitmaps": [
{
"flags": [
"auto"
],
"name": "a",
"granularity": 65536
}
],
"refcount-bits": 16,
"corrupt": false
}
},
"dirty-flag": false
},
"backing-filename-format": "qcow2", "backing-filename-format": "qcow2",
"virtual-size": 10485760, "virtual-size": 104857600,
"filename": "/tmp/pull4.1575911522", "filename": "/tmp/bitmaps.1591792938",
"cluster-size": 65536, "cluster-size": 65536,
"format": "qcow2", "format": "qcow2",
"actual-size": 208896, "actual-size": 221184,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"bitmaps": [
{
"flags": [
"auto"
],
"name": "a",
"granularity": 65536
}
],
"refcount-bits": 16,
"corrupt": false
}
},
"full-backing-filename": "/tmp/pull4.qcow2",
"backing-filename": "/tmp/pull4.qcow2",
"dirty-flag": false
},
"backing-filename-format": "qcow2",
"virtual-size": 10485760,
"filename": "/tmp/pull4.1575911527",
"cluster-size": 65536,
"format": "qcow2",
"actual-size": 217088,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"bitmaps": [
{
"flags": [
"auto"
],
"name": "c",
"granularity": 65536
},
{
"flags": [
],
"name": "b",
"granularity": 65536
},
{
"flags": [
],
"name": "a",
"granularity": 65536
}
],
"refcount-bits": 16,
"corrupt": false
}
},
"full-backing-filename": "/tmp/pull4.1575911522",
"backing-filename": "/tmp/pull4.1575911522",
"dirty-flag": false
},
"backing-filename-format": "qcow2",
"virtual-size": 10485760,
"filename": "/tmp/pull4.1575911540",
"cluster-size": 65536,
"format": "qcow2",
"actual-size": 212992,
"format-specific": { "format-specific": {
"type": "qcow2", "type": "qcow2",
"data": { "data": {
"compat": "1.1", "compat": "1.1",
"compression-type": "zlib",
"lazy-refcounts": false, "lazy-refcounts": false,
"bitmaps": [ "bitmaps": [
{ {
@ -365,7 +187,21 @@
}, },
{ {
"flags": [ "flags": [
"auto"
],
"name": "a",
"granularity": 65536
},
{
"flags": [
"auto"
],
"name": "b",
"granularity": 65536
},
{
"flags": [
"auto"
], ],
"name": "c", "name": "c",
"granularity": 65536 "granularity": 65536
@ -375,26 +211,44 @@
"corrupt": false "corrupt": false
} }
}, },
"full-backing-filename": "/tmp/pull4.1575911527", "full-backing-filename": "/tmp/bitmaps.1591792930",
"backing-filename": "/tmp/pull4.1575911527", "backing-filename": "/tmp/bitmaps.1591792930",
"dirty-flag": false "dirty-flag": false
}, },
"iops_wr": 0, "iops_wr": 0,
"ro": true, "ro": true,
"node-name": "libvirt-2-format", "node-name": "libvirt-2-format",
"backing_file_depth": 3, "backing_file_depth": 0,
"drv": "qcow2", "drv": "qcow2",
"iops": 0, "iops": 0,
"bps_wr": 0, "bps_wr": 0,
"write_threshold": 0, "write_threshold": 0,
"backing_file": "/tmp/pull4.1575911527", "backing_file": "/tmp/bitmaps.1591792930",
"dirty-bitmaps": [ "dirty-bitmaps": [
{ {
"name": "c", "name": "c",
"recording": false, "recording": true,
"persistent": true, "persistent": true,
"busy": false, "busy": false,
"status": "disabled", "status": "active",
"granularity": 65536,
"count": 0
},
{
"name": "b",
"recording": true,
"persistent": true,
"busy": false,
"status": "active",
"granularity": 65536,
"count": 0
},
{
"name": "a",
"recording": true,
"persistent": true,
"busy": false,
"status": "active",
"granularity": 65536, "granularity": 65536,
"count": 0 "count": 0
}, },
@ -416,17 +270,17 @@
"direct": false, "direct": false,
"writeback": true "writeback": true
}, },
"file": "/tmp/pull4.1575911540", "file": "/tmp/bitmaps.1591792938",
"encryption_key_missing": false "encryption_key_missing": false
}, },
{ {
"iops_rd": 0, "iops_rd": 0,
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"virtual-size": 393728, "virtual-size": 524800,
"filename": "/tmp/pull4.1575911540", "filename": "/tmp/bitmaps.1591792938",
"format": "file", "format": "file",
"actual-size": 212992, "actual-size": 221184,
"dirty-flag": false "dirty-flag": false
}, },
"iops_wr": 0, "iops_wr": 0,
@ -445,71 +299,16 @@
"direct": false, "direct": false,
"writeback": true "writeback": true
}, },
"file": "/tmp/pull4.1575911540", "file": "/tmp/bitmaps.1591792938",
"encryption_key_missing": false "encryption_key_missing": false
}, },
{ {
"iops_rd": 0, "iops_rd": 0,
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"backing-image": {
"backing-image": {
"virtual-size": 10485760,
"filename": "/tmp/pull4.qcow2",
"cluster-size": 65536,
"format": "qcow2",
"actual-size": 208896,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"bitmaps": [
{
"flags": [
"auto"
],
"name": "a",
"granularity": 65536
}
],
"refcount-bits": 16,
"corrupt": false
}
},
"dirty-flag": false
},
"backing-filename-format": "qcow2", "backing-filename-format": "qcow2",
"virtual-size": 10485760, "virtual-size": 104857600,
"filename": "/tmp/pull4.1575911522", "filename": "/tmp/bitmaps.1591792930",
"cluster-size": 65536,
"format": "qcow2",
"actual-size": 208896,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"bitmaps": [
{
"flags": [
"auto"
],
"name": "a",
"granularity": 65536
}
],
"refcount-bits": 16,
"corrupt": false
}
},
"full-backing-filename": "/tmp/pull4.qcow2",
"backing-filename": "/tmp/pull4.qcow2",
"dirty-flag": false
},
"backing-filename-format": "qcow2",
"virtual-size": 10485760,
"filename": "/tmp/pull4.1575911527",
"cluster-size": 65536, "cluster-size": 65536,
"format": "qcow2", "format": "qcow2",
"actual-size": 217088, "actual-size": 217088,
@ -517,6 +316,7 @@
"type": "qcow2", "type": "qcow2",
"data": { "data": {
"compat": "1.1", "compat": "1.1",
"compression-type": "zlib",
"lazy-refcounts": false, "lazy-refcounts": false,
"bitmaps": [ "bitmaps": [
{ {
@ -528,14 +328,14 @@
}, },
{ {
"flags": [ "flags": [
"auto"
], ],
"name": "b", "name": "b",
"granularity": 65536 "granularity": 65536
}, },
{ {
"flags": [ "flags": [
"auto"
], ],
"name": "a", "name": "a",
"granularity": 65536 "granularity": 65536
@ -545,35 +345,35 @@
"corrupt": false "corrupt": false
} }
}, },
"full-backing-filename": "/tmp/pull4.1575911522", "full-backing-filename": "/tmp/bitmaps.1591792925",
"backing-filename": "/tmp/pull4.1575911522", "backing-filename": "/tmp/bitmaps.1591792925",
"dirty-flag": false "dirty-flag": false
}, },
"iops_wr": 0, "iops_wr": 0,
"ro": true, "ro": true,
"node-name": "libvirt-3-format", "node-name": "libvirt-3-format",
"backing_file_depth": 2, "backing_file_depth": 0,
"drv": "qcow2", "drv": "qcow2",
"iops": 0, "iops": 0,
"bps_wr": 0, "bps_wr": 0,
"write_threshold": 0, "write_threshold": 0,
"backing_file": "/tmp/pull4.1575911522", "backing_file": "/tmp/bitmaps.1591792925",
"dirty-bitmaps": [ "dirty-bitmaps": [
{ {
"name": "a", "name": "a",
"recording": false, "recording": true,
"persistent": true, "persistent": true,
"busy": false, "busy": false,
"status": "disabled", "status": "active",
"granularity": 65536, "granularity": 65536,
"count": 0 "count": 0
}, },
{ {
"name": "b", "name": "b",
"recording": false, "recording": true,
"persistent": true, "persistent": true,
"busy": false, "busy": false,
"status": "disabled", "status": "active",
"granularity": 65536, "granularity": 65536,
"count": 0 "count": 0
}, },
@ -595,7 +395,7 @@
"direct": false, "direct": false,
"writeback": true "writeback": true
}, },
"file": "/tmp/pull4.1575911527", "file": "/tmp/bitmaps.1591792930",
"encryption_key_missing": false "encryption_key_missing": false
}, },
{ {
@ -603,7 +403,7 @@
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"virtual-size": 459264, "virtual-size": 459264,
"filename": "/tmp/pull4.1575911527", "filename": "/tmp/bitmaps.1591792930",
"format": "file", "format": "file",
"actual-size": 217088, "actual-size": 217088,
"dirty-flag": false "dirty-flag": false
@ -624,42 +424,16 @@
"direct": false, "direct": false,
"writeback": true "writeback": true
}, },
"file": "/tmp/pull4.1575911527", "file": "/tmp/bitmaps.1591792930",
"encryption_key_missing": false "encryption_key_missing": false
}, },
{ {
"iops_rd": 0, "iops_rd": 0,
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"backing-image": {
"virtual-size": 10485760,
"filename": "/tmp/pull4.qcow2",
"cluster-size": 65536,
"format": "qcow2",
"actual-size": 208896,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"bitmaps": [
{
"flags": [
"auto"
],
"name": "a",
"granularity": 65536
}
],
"refcount-bits": 16,
"corrupt": false
}
},
"dirty-flag": false
},
"backing-filename-format": "qcow2", "backing-filename-format": "qcow2",
"virtual-size": 10485760, "virtual-size": 104857600,
"filename": "/tmp/pull4.1575911522", "filename": "/tmp/bitmaps.1591792925",
"cluster-size": 65536, "cluster-size": 65536,
"format": "qcow2", "format": "qcow2",
"actual-size": 208896, "actual-size": 208896,
@ -667,6 +441,7 @@
"type": "qcow2", "type": "qcow2",
"data": { "data": {
"compat": "1.1", "compat": "1.1",
"compression-type": "zlib",
"lazy-refcounts": false, "lazy-refcounts": false,
"bitmaps": [ "bitmaps": [
{ {
@ -681,19 +456,19 @@
"corrupt": false "corrupt": false
} }
}, },
"full-backing-filename": "/tmp/pull4.qcow2", "full-backing-filename": "/tmp/bitmaps.qcow2",
"backing-filename": "/tmp/pull4.qcow2", "backing-filename": "/tmp/bitmaps.qcow2",
"dirty-flag": false "dirty-flag": false
}, },
"iops_wr": 0, "iops_wr": 0,
"ro": true, "ro": true,
"node-name": "libvirt-4-format", "node-name": "libvirt-4-format",
"backing_file_depth": 1, "backing_file_depth": 0,
"drv": "qcow2", "drv": "qcow2",
"iops": 0, "iops": 0,
"bps_wr": 0, "bps_wr": 0,
"write_threshold": 0, "write_threshold": 0,
"backing_file": "/tmp/pull4.qcow2", "backing_file": "/tmp/bitmaps.qcow2",
"dirty-bitmaps": [ "dirty-bitmaps": [
{ {
"name": "a", "name": "a",
@ -713,7 +488,7 @@
"direct": false, "direct": false,
"writeback": true "writeback": true
}, },
"file": "/tmp/pull4.1575911522", "file": "/tmp/bitmaps.1591792925",
"encryption_key_missing": false "encryption_key_missing": false
}, },
{ {
@ -721,7 +496,7 @@
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"virtual-size": 328192, "virtual-size": 328192,
"filename": "/tmp/pull4.1575911522", "filename": "/tmp/bitmaps.1591792925",
"format": "file", "format": "file",
"actual-size": 208896, "actual-size": 208896,
"dirty-flag": false "dirty-flag": false
@ -742,15 +517,15 @@
"direct": false, "direct": false,
"writeback": true "writeback": true
}, },
"file": "/tmp/pull4.1575911522", "file": "/tmp/bitmaps.1591792925",
"encryption_key_missing": false "encryption_key_missing": false
}, },
{ {
"iops_rd": 0, "iops_rd": 0,
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"virtual-size": 10485760, "virtual-size": 104857600,
"filename": "/tmp/pull4.qcow2", "filename": "/tmp/bitmaps.qcow2",
"cluster-size": 65536, "cluster-size": 65536,
"format": "qcow2", "format": "qcow2",
"actual-size": 208896, "actual-size": 208896,
@ -758,6 +533,7 @@
"type": "qcow2", "type": "qcow2",
"data": { "data": {
"compat": "1.1", "compat": "1.1",
"compression-type": "zlib",
"lazy-refcounts": false, "lazy-refcounts": false,
"bitmaps": [ "bitmaps": [
{ {
@ -801,7 +577,7 @@
"direct": false, "direct": false,
"writeback": true "writeback": true
}, },
"file": "/tmp/pull4.qcow2", "file": "/tmp/bitmaps.qcow2",
"encryption_key_missing": false "encryption_key_missing": false
}, },
{ {
@ -809,7 +585,7 @@
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"virtual-size": 328192, "virtual-size": 328192,
"filename": "/tmp/pull4.qcow2", "filename": "/tmp/bitmaps.qcow2",
"format": "file", "format": "file",
"actual-size": 208896, "actual-size": 208896,
"dirty-flag": false "dirty-flag": false
@ -830,7 +606,7 @@
"direct": false, "direct": false,
"writeback": true "writeback": true
}, },
"file": "/tmp/pull4.qcow2", "file": "/tmp/bitmaps.qcow2",
"encryption_key_missing": false "encryption_key_missing": false
} }
] ]

13
tests/qemublocktestdata/bitmap/snapshots.out
View File

@ -1,12 +1,17 @@
libvirt-1-format: libvirt-1-format:
d: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0 d: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
b: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
c: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
current: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0 current: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
libvirt-2-format: libvirt-2-format:
c: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0 c: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
b: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
d: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0 d: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
libvirt-3-format: libvirt-3-format:
a: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0 a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
b: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0 b: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
c: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0 c: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
libvirt-4-format: libvirt-4-format:
a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0 a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0