From 54d676350560f8eedf9dc2140f2eb879725e65b4 Mon Sep 17 00:00:00 2001
Message-Id: <54d676350560f8eedf9dc2140f2eb879725e65b4@dist-git>
From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 23 Jun 2020 12:23:45 +0200
Subject: [PATCH] qemublocktest: Delete 'synthetic' bitmap test cases
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
They will be replaced by a different set which will test scenarios
relevant for the new semantics.
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit 5aa423c52d784896675ce55c86ba662dbfc3ee95)
https://bugzilla.redhat.com/show_bug.cgi?id=1804593
Message-Id: <7373e6767b3f2572dd5437e29fa31c14aff5bc52.1592906423.git.pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
tests/qemublocktest.c | 3 -
.../bitmap/snapshots-synthetic-broken.json | 837 ------------------
.../bitmap/snapshots-synthetic-broken.out | 14 -
.../snapshots-synthetic-checkpoint.json | 827 -----------------
.../bitmap/snapshots-synthetic-checkpoint.out | 13 -
tests/qemublocktestdata/bitmap/synthetic.json | 118 ---
tests/qemublocktestdata/bitmap/synthetic.out | 6 -
7 files changed, 1818 deletions(-)
delete mode 100644 tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json
delete mode 100644 tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out
delete mode 100644 tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.json
delete mode 100644 tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.out
delete mode 100644 tests/qemublocktestdata/bitmap/synthetic.json
delete mode 100644 tests/qemublocktestdata/bitmap/synthetic.out
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index 239b2ef9df..75527ca64b 100644
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -1292,10 +1292,7 @@ mymain(void)
TEST_BITMAP_DETECT("empty");
TEST_BITMAP_DETECT("basic");
- TEST_BITMAP_DETECT("synthetic");
TEST_BITMAP_DETECT("snapshots");
- TEST_BITMAP_DETECT("snapshots-synthetic-checkpoint");
- TEST_BITMAP_DETECT("snapshots-synthetic-broken");
#define TEST_BACKUP_BITMAP_CALCULATE(testname, source, incrbackup, named) \
do { \
diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json
deleted file mode 100644
index 8cf14d4baa..0000000000
--- a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json
+++ /dev/null
@@ -1,837 +0,0 @@
-[
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "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",
- "virtual-size": 10485760,
- "filename": "/tmp/pull4.1575911522",
- "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,
- "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": {
- "type": "qcow2",
- "data": {
- "compat": "1.1",
- "lazy-refcounts": false,
- "bitmaps": [
- {
- "flags": [
- "in-use",
- "auto"
- ],
- "name": "current",
- "granularity": 65536
- },
- {
- "flags": [
- "in-use"
- ],
- "name": "d",
- "granularity": 65536
- }
- ],
- "refcount-bits": 16,
- "corrupt": false
- }
- },
- "full-backing-filename": "/tmp/pull4.1575911540",
- "backing-filename": "/tmp/pull4.1575911540",
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "libvirt-1-format",
- "backing_file_depth": 4,
- "drv": "qcow2",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "backing_file": "/tmp/pull4.1575911540",
- "dirty-bitmaps": [
- {
- "name": "d",
- "recording": false,
- "persistent": true,
- "busy": false,
- "status": "disabled",
- "granularity": 65536,
- "count": 0
- },
- {
- "name": "current",
- "recording": true,
- "persistent": true,
- "busy": false,
- "status": "active",
- "granularity": 65536,
- "count": 0
- }
- ],
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.1575911550",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 393728,
- "filename": "/tmp/pull4.1575911550",
- "format": "file",
- "actual-size": 212992,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "libvirt-1-storage",
- "backing_file_depth": 0,
- "drv": "file",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.1575911550",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "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",
- "virtual-size": 10485760,
- "filename": "/tmp/pull4.1575911522",
- "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,
- "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
- },
- "iops_wr": 0,
- "ro": true,
- "node-name": "libvirt-2-format",
- "backing_file_depth": 3,
- "drv": "qcow2",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "backing_file": "/tmp/pull4.1575911527",
- "dirty-bitmaps": [
- {
- "name": "c",
- "recording": false,
- "persistent": true,
- "busy": false,
- "status": "disabled",
- "granularity": 65536,
- "count": 0
- },
- {
- "name": "oa",
- "recording": true,
- "persistent": true,
- "busy": false,
- "status": "active",
- "granularity": 65536,
- "count": 0
- },
- {
- "name": "ob",
- "recording": true,
- "persistent": true,
- "busy": false,
- "status": "active",
- "granularity": 65536,
- "count": 0
- },
- {
- "name": "d",
- "recording": true,
- "persistent": true,
- "busy": false,
- "status": "active",
- "granularity": 65536,
- "inconsistent": true,
- "count": 0
- }
- ],
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.1575911540",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 393728,
- "filename": "/tmp/pull4.1575911540",
- "format": "file",
- "actual-size": 212992,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "libvirt-2-storage",
- "backing_file_depth": 0,
- "drv": "file",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.1575911540",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "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",
- "virtual-size": 10485760,
- "filename": "/tmp/pull4.1575911522",
- "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,
- "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
- },
- "iops_wr": 0,
- "ro": true,
- "node-name": "libvirt-3-format",
- "backing_file_depth": 2,
- "drv": "qcow2",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "backing_file": "/tmp/pull4.1575911522",
- "dirty-bitmaps": [
- {
- "name": "a",
- "recording": false,
- "persistent": true,
- "busy": false,
- "status": "disabled",
- "granularity": 65536,
- "count": 0
- },
- {
- "name": "b",
- "recording": true,
- "persistent": true,
- "busy": false,
- "status": "disabled",
- "granularity": 65536,
- "count": 0
- }
- ],
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.1575911527",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 459264,
- "filename": "/tmp/pull4.1575911527",
- "format": "file",
- "actual-size": 217088,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "libvirt-3-storage",
- "backing_file_depth": 0,
- "drv": "file",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.1575911527",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "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",
- "virtual-size": 10485760,
- "filename": "/tmp/pull4.1575911522",
- "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
- },
- "iops_wr": 0,
- "ro": true,
- "node-name": "libvirt-4-format",
- "backing_file_depth": 1,
- "drv": "qcow2",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "backing_file": "/tmp/pull4.qcow2",
- "dirty-bitmaps": [
- ],
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.1575911522",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 328192,
- "filename": "/tmp/pull4.1575911522",
- "format": "file",
- "actual-size": 208896,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "libvirt-4-storage",
- "backing_file_depth": 0,
- "drv": "file",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.1575911522",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "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
- },
- "iops_wr": 0,
- "ro": true,
- "node-name": "libvirt-5-format",
- "backing_file_depth": 0,
- "drv": "qcow2",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "dirty-bitmaps": [
- {
- "name": "a",
- "recording": true,
- "persistent": true,
- "busy": false,
- "status": "active",
- "granularity": 65536,
- "count": 0
- }
- ],
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.qcow2",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 328192,
- "filename": "/tmp/pull4.qcow2",
- "format": "file",
- "actual-size": 208896,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "libvirt-5-storage",
- "backing_file_depth": 0,
- "drv": "file",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.qcow2",
- "encryption_key_missing": false
- }
-]
diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out
deleted file mode 100644
index ad24a580f1..0000000000
--- a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out
+++ /dev/null
@@ -1,14 +0,0 @@
-libvirt-1-format:
- d: record:0 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:
- c: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
- oa: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
- ob: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
- d: record:1 busy:0 persist:1 inconsist:1 gran:65536 dirty:0
-libvirt-3-format:
- a: 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
-libvirt-4-format:
-libvirt-5-format:
- a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.json b/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.json
deleted file mode 100644
index 25cc150d67..0000000000
--- a/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.json
+++ /dev/null
@@ -1,827 +0,0 @@
-[
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "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",
- "virtual-size": 10485760,
- "filename": "/tmp/pull4.1575911522",
- "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,
- "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": {
- "type": "qcow2",
- "data": {
- "compat": "1.1",
- "lazy-refcounts": false,
- "bitmaps": [
- {
- "flags": [
- "in-use",
- "auto"
- ],
- "name": "current",
- "granularity": 65536
- },
- {
- "flags": [
- "in-use"
- ],
- "name": "d",
- "granularity": 65536
- }
- ],
- "refcount-bits": 16,
- "corrupt": false
- }
- },
- "full-backing-filename": "/tmp/pull4.1575911540",
- "backing-filename": "/tmp/pull4.1575911540",
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "libvirt-1-format",
- "backing_file_depth": 4,
- "drv": "qcow2",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "backing_file": "/tmp/pull4.1575911540",
- "dirty-bitmaps": [
- {
- "name": "d",
- "recording": false,
- "persistent": true,
- "busy": false,
- "status": "disabled",
- "granularity": 65536,
- "count": 0
- },
- {
- "name": "current",
- "recording": true,
- "persistent": true,
- "busy": false,
- "status": "active",
- "granularity": 65536,
- "count": 0
- }
- ],
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.1575911550",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 393728,
- "filename": "/tmp/pull4.1575911550",
- "format": "file",
- "actual-size": 212992,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "libvirt-1-storage",
- "backing_file_depth": 0,
- "drv": "file",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.1575911550",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "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",
- "virtual-size": 10485760,
- "filename": "/tmp/pull4.1575911522",
- "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,
- "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
- },
- "iops_wr": 0,
- "ro": true,
- "node-name": "libvirt-2-format",
- "backing_file_depth": 3,
- "drv": "qcow2",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "backing_file": "/tmp/pull4.1575911527",
- "dirty-bitmaps": [
- {
- "name": "c",
- "recording": false,
- "persistent": true,
- "busy": false,
- "status": "disabled",
- "granularity": 65536,
- "count": 0
- },
- {
- "name": "d",
- "recording": true,
- "persistent": true,
- "busy": false,
- "status": "active",
- "granularity": 65536,
- "count": 0
- }
- ],
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.1575911540",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 393728,
- "filename": "/tmp/pull4.1575911540",
- "format": "file",
- "actual-size": 212992,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "libvirt-2-storage",
- "backing_file_depth": 0,
- "drv": "file",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.1575911540",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "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",
- "virtual-size": 10485760,
- "filename": "/tmp/pull4.1575911522",
- "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,
- "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
- },
- "iops_wr": 0,
- "ro": true,
- "node-name": "libvirt-3-format",
- "backing_file_depth": 2,
- "drv": "qcow2",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "backing_file": "/tmp/pull4.1575911522",
- "dirty-bitmaps": [
- {
- "name": "a",
- "recording": false,
- "persistent": true,
- "busy": false,
- "status": "disabled",
- "granularity": 65536,
- "count": 0
- },
- {
- "name": "b",
- "recording": true,
- "persistent": true,
- "busy": false,
- "status": "disabled",
- "granularity": 65536,
- "count": 0
- }
- ],
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.1575911527",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 459264,
- "filename": "/tmp/pull4.1575911527",
- "format": "file",
- "actual-size": 217088,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "libvirt-3-storage",
- "backing_file_depth": 0,
- "drv": "file",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.1575911527",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "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",
- "virtual-size": 10485760,
- "filename": "/tmp/pull4.1575911522",
- "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
- },
- "iops_wr": 0,
- "ro": true,
- "node-name": "libvirt-4-format",
- "backing_file_depth": 1,
- "drv": "qcow2",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "backing_file": "/tmp/pull4.qcow2",
- "dirty-bitmaps": [
- {
- "name": "a",
- "recording": true,
- "persistent": true,
- "busy": false,
- "status": "active",
- "granularity": 65536,
- "count": 0
- }
- ],
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.1575911522",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 328192,
- "filename": "/tmp/pull4.1575911522",
- "format": "file",
- "actual-size": 208896,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "libvirt-4-storage",
- "backing_file_depth": 0,
- "drv": "file",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.1575911522",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "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
- },
- "iops_wr": 0,
- "ro": true,
- "node-name": "libvirt-5-format",
- "backing_file_depth": 0,
- "drv": "qcow2",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "dirty-bitmaps": [
- {
- "name": "a",
- "recording": true,
- "persistent": true,
- "busy": false,
- "status": "active",
- "granularity": 65536,
- "count": 0
- }
- ],
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.qcow2",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 328192,
- "filename": "/tmp/pull4.qcow2",
- "format": "file",
- "actual-size": 208896,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "libvirt-5-storage",
- "backing_file_depth": 0,
- "drv": "file",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.qcow2",
- "encryption_key_missing": false
- }
-]
diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.out b/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.out
deleted file mode 100644
index 0270657001..0000000000
--- a/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.out
+++ /dev/null
@@ -1,13 +0,0 @@
-libvirt-1-format:
- d: record:0 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:
- c: 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
-libvirt-3-format:
- a: 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
-libvirt-4-format:
- a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
-libvirt-5-format:
- a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
diff --git a/tests/qemublocktestdata/bitmap/synthetic.json b/tests/qemublocktestdata/bitmap/synthetic.json
deleted file mode 100644
index 56882bd615..0000000000
--- a/tests/qemublocktestdata/bitmap/synthetic.json
+++ /dev/null
@@ -1,118 +0,0 @@
-[
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 10485760,
- "filename": "/tmp/pull4.qcow2",
- "cluster-size": 65536,
- "format": "qcow2",
- "actual-size": 200704,
- "format-specific": {
- "type": "qcow2",
- "data": {
- "compat": "1.1",
- "lazy-refcounts": false,
- "refcount-bits": 16,
- "corrupt": false
- }
- },
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "libvirt-1-format",
- "backing_file_depth": 0,
- "drv": "qcow2",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "dirty-bitmaps": [
- {
- "name": "current",
- "recording": true,
- "persistent": true,
- "busy": false,
- "status": "active",
- "granularity": 65536,
- "count": 0
- },
- {
- "name": "d",
- "recording": false,
- "persistent": false,
- "busy": false,
- "status": "disabled",
- "granularity": 65536,
- "count": 0
- },
- {
- "name": "c",
- "recording": false,
- "persistent": true,
- "busy": false,
- "status": "disabled",
- "granularity": 1234,
- "count": 0
- },
- {
- "name": "b",
- "recording": false,
- "persistent": true,
- "busy": true,
- "status": "disabled",
- "granularity": 65536,
- "count": 21314
- },
- {
- "name": "a",
- "recording": false,
- "persistent": true,
- "busy": false,
- "status": "disabled",
- "inconsistent": true,
- "granularity": 65536,
- "count": 0
- }
- ],
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.qcow2",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 197120,
- "filename": "/tmp/pull4.qcow2",
- "format": "file",
- "actual-size": 200704,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "libvirt-1-storage",
- "backing_file_depth": 0,
- "drv": "file",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "/tmp/pull4.qcow2",
- "encryption_key_missing": false
- }
-]
diff --git a/tests/qemublocktestdata/bitmap/synthetic.out b/tests/qemublocktestdata/bitmap/synthetic.out
deleted file mode 100644
index e8041c5b77..0000000000
--- a/tests/qemublocktestdata/bitmap/synthetic.out
+++ /dev/null
@@ -1,6 +0,0 @@
-libvirt-1-format:
- current: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
- d: record:0 busy:0 persist:0 inconsist:0 gran:65536 dirty:0
- c: record:0 busy:0 persist:1 inconsist:0 gran:1234 dirty:0
- b: record:0 busy:1 persist:1 inconsist:0 gran:65536 dirty:21314
- a: record:0 busy:0 persist:1 inconsist:1 gran:65536 dirty:0
--
2.27.0