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