rpms
/
libvirt
7
0
Fork 1
Code Issues Pull Requests Releases Activity
libvirt/SOURCES/libvirt-qemublocktest-Disab...

3367 lines
81 KiB
Diff
Raw Blame History

From 7bbd4fea7b99290161c740c406aa46665b32be92 Mon Sep 17 00:00:00 2001
Message-Id: <7bbd4fea7b99290161c740c406aa46665b32be92@dist-git>
From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 23 Jun 2020 12:23:44 +0200
Subject: [PATCH] qemublocktest: Disable testcases for all bitmap handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upcoming patches are going to rewrite and semantically modify how
bitmaps are handled during blockjobs. This is possible as incremental
backup is not yet fully enabled.
As the changes are going to be incompatible with any current test data
remove all test cases for bitmap handling during checkpoint deletion,
incremental backups, block commit, block copy, and bitmap validation
operations.
The tests will be gradually added back later after the code and
test-data is refactored.
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit e0828604f77b61d8ee41e72758b0c9d712b1e263)
https://bugzilla.redhat.com/show_bug.cgi?id=1804593
Message-Id: <edef656f39903967dae9e403e8b99f20e807e092.1592906423.git.pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
tests/qemublocktest.c | 94 -------------
.../backupmerge/basic-deep-out.json | 22 ---
.../backupmerge/basic-flat-out.json | 6 -
.../backupmerge/basic-intermediate-out.json | 10 --
.../backupmerge/snapshot-deep-out.json | 38 -----
.../backupmerge/snapshot-flat-out.json | 6 -
.../snapshot-intermediate-out.json | 14 --
.../bitmapblockcommit/basic-1-2 | 119 ----------------
.../bitmapblockcommit/basic-1-3 | 119 ----------------
.../bitmapblockcommit/basic-2-3 | 2 -
.../bitmapblockcommit/snapshots-1-2 | 49 -------
.../bitmapblockcommit/snapshots-1-3 | 76 ----------
.../bitmapblockcommit/snapshots-1-4 | 126 -----------------
.../bitmapblockcommit/snapshots-1-5 | 130 -----------------
.../bitmapblockcommit/snapshots-2-3 | 49 -------
.../bitmapblockcommit/snapshots-2-4 | 99 -------------
.../bitmapblockcommit/snapshots-2-5 | 103 --------------
.../bitmapblockcommit/snapshots-3-4 | 72 ----------
.../bitmapblockcommit/snapshots-3-5 | 76 ----------
.../bitmapblockcommit/snapshots-4-5 | 33 -----
.../snapshots-synthetic-broken-1-2 | 57 --------
.../snapshots-synthetic-broken-1-3 | 112 ---------------
.../snapshots-synthetic-broken-1-4 | 119 ----------------
.../snapshots-synthetic-broken-1-5 | 119 ----------------
.../snapshots-synthetic-broken-2-3 | 89 ------------
.../snapshots-synthetic-broken-2-4 | 96 -------------
.../snapshots-synthetic-broken-2-5 | 96 -------------
.../snapshots-synthetic-broken-3-4 | 27 ----
.../snapshots-synthetic-broken-3-5 | 27 ----
.../snapshots-synthetic-broken-4-5 | 20 ---
.../bitmapblockcopy/basic-deep-out.json | 117 ---------------
.../bitmapblockcopy/basic-shallow-out.json | 117 ---------------
.../bitmapblockcopy/snapshots-deep-out.json | 133 ------------------
.../snapshots-shallow-out.json | 48 -------
.../checkpointdelete/basic-current-out.json | 29 ----
.../basic-intermediate1-out.json | 22 ---
.../basic-intermediate2-out.json | 22 ---
.../basic-intermediate3-out.json | 22 ---
.../checkpointdelete/basic-noparent-out.json | 9 --
.../snapshots-current-out.json | 29 ----
.../snapshots-intermediate1-out.json | 24 ----
.../snapshots-intermediate2-out.json | 62 --------
.../snapshots-intermediate3-out.json | 61 --------
.../snapshots-noparent-out.json | 27 ----
...hots-synthetic-checkpoint-current-out.json | 29 ----
...ynthetic-checkpoint-intermediate1-out.json | 31 ----
...ynthetic-checkpoint-intermediate2-out.json | 34 -----
...ynthetic-checkpoint-intermediate3-out.json | 61 --------
...ots-synthetic-checkpoint-noparent-out.json | 27 ----
49 files changed, 2909 deletions(-)
delete mode 100644 tests/qemublocktestdata/backupmerge/basic-deep-out.json
delete mode 100644 tests/qemublocktestdata/backupmerge/basic-flat-out.json
delete mode 100644 tests/qemublocktestdata/backupmerge/basic-intermediate-out.json
delete mode 100644 tests/qemublocktestdata/backupmerge/snapshot-deep-out.json
delete mode 100644 tests/qemublocktestdata/backupmerge/snapshot-flat-out.json
delete mode 100644 tests/qemublocktestdata/backupmerge/snapshot-intermediate-out.json
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-1-2
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-1-3
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-2-3
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5
delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5
delete mode 100644 tests/qemublocktestdata/bitmapblockcopy/basic-deep-out.json
delete mode 100644 tests/qemublocktestdata/bitmapblockcopy/basic-shallow-out.json
delete mode 100644 tests/qemublocktestdata/bitmapblockcopy/snapshots-deep-out.json
delete mode 100644 tests/qemublocktestdata/bitmapblockcopy/snapshots-shallow-out.json
delete mode 100644 tests/qemublocktestdata/checkpointdelete/basic-current-out.json
delete mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
delete mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
delete mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
delete mode 100644 tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json
delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json
delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-current-out.json
delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json
delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json
delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json
delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index 36e3378f5b..239b2ef9df 100644
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -1311,14 +1311,6 @@ mymain(void)
TEST_BACKUP_BITMAP_CALCULATE("empty", bitmapSourceChain, "a", "empty");
- TEST_BACKUP_BITMAP_CALCULATE("basic-flat", bitmapSourceChain, "current", "basic");
- TEST_BACKUP_BITMAP_CALCULATE("basic-intermediate", bitmapSourceChain, "d", "basic");
- TEST_BACKUP_BITMAP_CALCULATE("basic-deep", bitmapSourceChain, "a", "basic");
-
- TEST_BACKUP_BITMAP_CALCULATE("snapshot-flat", bitmapSourceChain, "current", "snapshots");
- TEST_BACKUP_BITMAP_CALCULATE("snapshot-intermediate", bitmapSourceChain, "d", "snapshots");
- TEST_BACKUP_BITMAP_CALCULATE("snapshot-deep", bitmapSourceChain, "a", "snapshots");
-
#define TEST_CHECKPOINT_DELETE_MERGE(testname, delbmp, parbmp, named) \
do { \
checkpointdeletedata.name = testname; \
@@ -1333,24 +1325,6 @@ mymain(void)
TEST_CHECKPOINT_DELETE_MERGE("empty", "a", NULL, "empty");
- TEST_CHECKPOINT_DELETE_MERGE("basic-noparent", "a", NULL, "basic");
- TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate1", "b", "a", "basic");
- TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate2", "c", "b", "basic");
- TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate3", "d", "c", "basic");
- TEST_CHECKPOINT_DELETE_MERGE("basic-current", "current", "d", "basic");
-
- TEST_CHECKPOINT_DELETE_MERGE("snapshots-noparent", "a", NULL, "snapshots");
- TEST_CHECKPOINT_DELETE_MERGE("snapshots-intermediate1", "b", "a", "snapshots");
- TEST_CHECKPOINT_DELETE_MERGE("snapshots-intermediate2", "c", "b", "snapshots");
- TEST_CHECKPOINT_DELETE_MERGE("snapshots-intermediate3", "d", "c", "snapshots");
- TEST_CHECKPOINT_DELETE_MERGE("snapshots-current", "current", "d", "snapshots");
-
- TEST_CHECKPOINT_DELETE_MERGE("snapshots-synthetic-checkpoint-noparent", "a", NULL, "snapshots-synthetic-checkpoint");
- TEST_CHECKPOINT_DELETE_MERGE("snapshots-synthetic-checkpoint-intermediate1", "b", "a", "snapshots-synthetic-checkpoint");
- TEST_CHECKPOINT_DELETE_MERGE("snapshots-synthetic-checkpoint-intermediate2", "c", "b", "snapshots-synthetic-checkpoint");
- TEST_CHECKPOINT_DELETE_MERGE("snapshots-synthetic-checkpoint-intermediate3", "d", "c", "snapshots-synthetic-checkpoint");
- TEST_CHECKPOINT_DELETE_MERGE("snapshots-synthetic-checkpoint-current", "current", "d", "snapshots-synthetic-checkpoint");
-
#define TEST_BITMAP_VALIDATE(testname, bitmap, rc) \
do { \
blockbitmapvalidatedata.name = testname; \
@@ -1365,36 +1339,6 @@ mymain(void)
TEST_BITMAP_VALIDATE("empty", "a", false);
- TEST_BITMAP_VALIDATE("basic", "a", true);
- TEST_BITMAP_VALIDATE("basic", "b", true);
- TEST_BITMAP_VALIDATE("basic", "c", true);
- TEST_BITMAP_VALIDATE("basic", "d", true);
- TEST_BITMAP_VALIDATE("basic", "current", true);
-
- TEST_BITMAP_VALIDATE("snapshots", "a", true);
- TEST_BITMAP_VALIDATE("snapshots", "b", true);
- TEST_BITMAP_VALIDATE("snapshots", "c", true);
- TEST_BITMAP_VALIDATE("snapshots", "d", true);
- TEST_BITMAP_VALIDATE("snapshots", "current", true);
-
- TEST_BITMAP_VALIDATE("synthetic", "a", false);
- TEST_BITMAP_VALIDATE("synthetic", "b", true);
- TEST_BITMAP_VALIDATE("synthetic", "c", true);
- TEST_BITMAP_VALIDATE("synthetic", "d", true);
- TEST_BITMAP_VALIDATE("synthetic", "current", true);
-
- TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "a", true);
- TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "b", true);
- TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "c", true);
- TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "d", true);
- TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "current", true);
-
- TEST_BITMAP_VALIDATE("snapshots-synthetic-broken", "a", false);
- TEST_BITMAP_VALIDATE("snapshots-synthetic-broken", "b", true);
- TEST_BITMAP_VALIDATE("snapshots-synthetic-broken", "c", true);
- TEST_BITMAP_VALIDATE("snapshots-synthetic-broken", "d", false);
- TEST_BITMAP_VALIDATE("snapshots-synthetic-broken", "current", true);
-
#define TEST_BITMAP_BLOCKCOPY(testname, shllw, ndf) \
do { \
blockbitmapblockcopydata.name = testname; \
@@ -1410,12 +1354,6 @@ mymain(void)
TEST_BITMAP_BLOCKCOPY("empty-shallow", true, "empty");
TEST_BITMAP_BLOCKCOPY("empty-deep", false, "empty");
- TEST_BITMAP_BLOCKCOPY("basic-shallow", true, "basic");
- TEST_BITMAP_BLOCKCOPY("basic-deep", false, "basic");
-
- TEST_BITMAP_BLOCKCOPY("snapshots-shallow", true, "snapshots");
- TEST_BITMAP_BLOCKCOPY("snapshots-deep", false, "snapshots");
-
#define TEST_BITMAP_BLOCKCOMMIT(testname, topimg, baseimg, ndf) \
do {\
@@ -1431,38 +1369,6 @@ mymain(void)
TEST_BITMAP_BLOCKCOMMIT("empty", 1, 2, "empty");
- TEST_BITMAP_BLOCKCOMMIT("basic-1-2", 1, 2, "basic");
- TEST_BITMAP_BLOCKCOMMIT("basic-1-3", 1, 3, "basic");
- TEST_BITMAP_BLOCKCOMMIT("basic-2-3", 2, 3, "basic");
-
- TEST_BITMAP_BLOCKCOMMIT("snapshots-1-2", 1, 2, "snapshots");
- TEST_BITMAP_BLOCKCOMMIT("snapshots-1-3", 1, 3, "snapshots");
- TEST_BITMAP_BLOCKCOMMIT("snapshots-1-4", 1, 4, "snapshots");
- TEST_BITMAP_BLOCKCOMMIT("snapshots-1-5", 1, 5, "snapshots");
-
- TEST_BITMAP_BLOCKCOMMIT("snapshots-2-3", 2, 3, "snapshots");
- TEST_BITMAP_BLOCKCOMMIT("snapshots-2-4", 2, 4, "snapshots");
- TEST_BITMAP_BLOCKCOMMIT("snapshots-2-5", 2, 5, "snapshots");
-
- TEST_BITMAP_BLOCKCOMMIT("snapshots-3-4", 3, 4, "snapshots");
- TEST_BITMAP_BLOCKCOMMIT("snapshots-3-5", 3, 5, "snapshots");
-
- TEST_BITMAP_BLOCKCOMMIT("snapshots-4-5", 4, 5, "snapshots");
-
- TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-2", 1, 2, "snapshots-synthetic-broken");
- TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-3", 1, 3, "snapshots-synthetic-broken");
- TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-4", 1, 4, "snapshots-synthetic-broken");
- TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-5", 1, 5, "snapshots-synthetic-broken");
-
- TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-2-3", 2, 3, "snapshots-synthetic-broken");
- TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-2-4", 2, 4, "snapshots-synthetic-broken");
- TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-2-5", 2, 5, "snapshots-synthetic-broken");
-
- TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-3-4", 3, 4, "snapshots-synthetic-broken");
- TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-3-5", 3, 5, "snapshots-synthetic-broken");
-
- TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-4-5", 4, 5, "snapshots-synthetic-broken");
-
cleanup:
qemuTestDriverFree(&driver);
VIR_FREE(capslatest_x86_64);
diff --git a/tests/qemublocktestdata/backupmerge/basic-deep-out.json b/tests/qemublocktestdata/backupmerge/basic-deep-out.json
deleted file mode 100644
index 28c3d16259..0000000000
--- a/tests/qemublocktestdata/backupmerge/basic-deep-out.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
- {
- "node": "libvirt-1-format",
- "name": "current"
- },
- {
- "node": "libvirt-1-format",
- "name": "d"
- },
- {
- "node": "libvirt-1-format",
- "name": "c"
- },
- {
- "node": "libvirt-1-format",
- "name": "b"
- },
- {
- "node": "libvirt-1-format",
- "name": "a"
- }
-]
diff --git a/tests/qemublocktestdata/backupmerge/basic-flat-out.json b/tests/qemublocktestdata/backupmerge/basic-flat-out.json
deleted file mode 100644
index b89252e284..0000000000
--- a/tests/qemublocktestdata/backupmerge/basic-flat-out.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
-]
diff --git a/tests/qemublocktestdata/backupmerge/basic-intermediate-out.json b/tests/qemublocktestdata/backupmerge/basic-intermediate-out.json
deleted file mode 100644
index 0dffcafd5f..0000000000
--- a/tests/qemublocktestdata/backupmerge/basic-intermediate-out.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
- "node": "libvirt-1-format",
- "name": "current"
- },
- {
- "node": "libvirt-1-format",
- "name": "d"
- }
-]
diff --git a/tests/qemublocktestdata/backupmerge/snapshot-deep-out.json b/tests/qemublocktestdata/backupmerge/snapshot-deep-out.json
deleted file mode 100644
index 526fc8d55b..0000000000
--- a/tests/qemublocktestdata/backupmerge/snapshot-deep-out.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
- {
- "node": "libvirt-1-format",
- "name": "current"
- },
- {
- "node": "libvirt-1-format",
- "name": "d"
- },
- {
- "node": "libvirt-2-format",
- "name": "d"
- },
- {
- "node": "libvirt-2-format",
- "name": "c"
- },
- {
- "node": "libvirt-3-format",
- "name": "c"
- },
- {
- "node": "libvirt-3-format",
- "name": "b"
- },
- {
- "node": "libvirt-3-format",
- "name": "a"
- },
- {
- "node": "libvirt-4-format",
- "name": "a"
- },
- {
- "node": "libvirt-5-format",
- "name": "a"
- }
-]
diff --git a/tests/qemublocktestdata/backupmerge/snapshot-flat-out.json b/tests/qemublocktestdata/backupmerge/snapshot-flat-out.json
deleted file mode 100644
index b89252e284..0000000000
--- a/tests/qemublocktestdata/backupmerge/snapshot-flat-out.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
-]
diff --git a/tests/qemublocktestdata/backupmerge/snapshot-intermediate-out.json b/tests/qemublocktestdata/backupmerge/snapshot-intermediate-out.json
deleted file mode 100644
index 537d776ec6..0000000000
--- a/tests/qemublocktestdata/backupmerge/snapshot-intermediate-out.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
- {
- "node": "libvirt-1-format",
- "name": "current"
- },
- {
- "node": "libvirt-1-format",
- "name": "d"
- },
- {
- "node": "libvirt-2-format",
- "name": "d"
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/basic-1-2 b/tests/qemublocktestdata/bitmapblockcommit/basic-1-2
deleted file mode 100644
index 8eeb4c3a11..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/basic-1-2
+++ /dev/null
@@ -1,119 +0,0 @@
-pre job bitmap disable:
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-2-format",
- "name": "a",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-2-format",
- "target": "a",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "a"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-2-format",
- "name": "b",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-2-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-2-format",
- "name": "current",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-2-format",
- "target": "current",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-2-format",
- "name": "c",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-2-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-2-format",
- "name": "d",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-2-format",
- "target": "d",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "d"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/basic-1-3 b/tests/qemublocktestdata/bitmapblockcommit/basic-1-3
deleted file mode 100644
index 71b48e31a5..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/basic-1-3
+++ /dev/null
@@ -1,119 +0,0 @@
-pre job bitmap disable:
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-3-format",
- "name": "a",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "a",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "a"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-3-format",
- "name": "b",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-3-format",
- "name": "current",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "current",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-3-format",
- "name": "c",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-3-format",
- "name": "d",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "d",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "d"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/basic-2-3 b/tests/qemublocktestdata/bitmapblockcommit/basic-2-3
deleted file mode 100644
index bfc58f994e..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/basic-2-3
+++ /dev/null
@@ -1,2 +0,0 @@
-pre job bitmap disable:
-merge bitmpas:
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2
deleted file mode 100644
index 0015b9ceb3..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2
+++ /dev/null
@@ -1,49 +0,0 @@
-pre job bitmap disable:
-[
- {
- "type": "block-dirty-bitmap-disable",
- "data": {
- "node": "libvirt-2-format",
- "name": "d"
- }
- }
-]
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-2-format",
- "name": "current",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-2-format",
- "target": "current",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-2-format",
- "target": "d",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "d"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3
deleted file mode 100644
index 5691b408aa..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3
+++ /dev/null
@@ -1,76 +0,0 @@
-pre job bitmap disable:
-[
- {
- "type": "block-dirty-bitmap-disable",
- "data": {
- "node": "libvirt-3-format",
- "name": "c"
- }
- }
-]
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-3-format",
- "name": "current",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "current",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-3-format",
- "name": "d",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "d",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "d"
- },
- {
- "node": "libvirt-2-format",
- "name": "d"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4
deleted file mode 100644
index 454001531a..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4
+++ /dev/null
@@ -1,126 +0,0 @@
-pre job bitmap disable:
-[
- {
- "type": "block-dirty-bitmap-disable",
- "data": {
- "node": "libvirt-4-format",
- "name": "a"
- }
- }
-]
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "a",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "a"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "b",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "current",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "current",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "c",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "c"
- },
- {
- "node": "libvirt-3-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "d",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "d",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "d"
- },
- {
- "node": "libvirt-2-format",
- "name": "d"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5
deleted file mode 100644
index 2fd43d7917..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5
+++ /dev/null
@@ -1,130 +0,0 @@
-pre job bitmap disable:
-[
- {
- "type": "block-dirty-bitmap-disable",
- "data": {
- "node": "libvirt-5-format",
- "name": "a"
- }
- }
-]
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "a",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "a"
- },
- {
- "node": "libvirt-4-format",
- "name": "a"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "b",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "current",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "current",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "c",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "c"
- },
- {
- "node": "libvirt-3-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "d",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "d",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "d"
- },
- {
- "node": "libvirt-2-format",
- "name": "d"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3
deleted file mode 100644
index d719a90bd7..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3
+++ /dev/null
@@ -1,49 +0,0 @@
-pre job bitmap disable:
-[
- {
- "type": "block-dirty-bitmap-disable",
- "data": {
- "node": "libvirt-3-format",
- "name": "c"
- }
- }
-]
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-3-format",
- "name": "d",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "d",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "d"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4
deleted file mode 100644
index 9e37962344..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4
+++ /dev/null
@@ -1,99 +0,0 @@
-pre job bitmap disable:
-[
- {
- "type": "block-dirty-bitmap-disable",
- "data": {
- "node": "libvirt-4-format",
- "name": "a"
- }
- }
-]
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "a",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "a"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "b",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "c",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "c"
- },
- {
- "node": "libvirt-3-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "d",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "d",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "d"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5
deleted file mode 100644
index d6b20a5d05..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5
+++ /dev/null
@@ -1,103 +0,0 @@
-pre job bitmap disable:
-[
- {
- "type": "block-dirty-bitmap-disable",
- "data": {
- "node": "libvirt-5-format",
- "name": "a"
- }
- }
-]
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "a",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "a"
- },
- {
- "node": "libvirt-4-format",
- "name": "a"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "b",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "c",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "c"
- },
- {
- "node": "libvirt-3-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "d",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "d",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "d"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4
deleted file mode 100644
index b96e8910d7..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4
+++ /dev/null
@@ -1,72 +0,0 @@
-pre job bitmap disable:
-[
- {
- "type": "block-dirty-bitmap-disable",
- "data": {
- "node": "libvirt-4-format",
- "name": "a"
- }
- }
-]
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "a",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "a"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "b",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "c",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "c"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5
deleted file mode 100644
index 9570c34c40..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5
+++ /dev/null
@@ -1,76 +0,0 @@
-pre job bitmap disable:
-[
- {
- "type": "block-dirty-bitmap-disable",
- "data": {
- "node": "libvirt-5-format",
- "name": "a"
- }
- }
-]
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "a",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "a"
- },
- {
- "node": "libvirt-4-format",
- "name": "a"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "b",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "c",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "c"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5
deleted file mode 100644
index 7e1020d96e..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5
+++ /dev/null
@@ -1,33 +0,0 @@
-pre job bitmap disable:
-[
- {
- "type": "block-dirty-bitmap-disable",
- "data": {
- "node": "libvirt-5-format",
- "name": "a"
- }
- }
-]
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-enable",
- "data": {
- "node": "libvirt-5-format",
- "name": "a"
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "a",
- "bitmaps": [
- {
- "node": "libvirt-4-format",
- "name": "a"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
deleted file mode 100644
index 463120d442..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
+++ /dev/null
@@ -1,57 +0,0 @@
-pre job bitmap disable:
-[
- {
- "type": "block-dirty-bitmap-disable",
- "data": {
- "node": "libvirt-2-format",
- "name": "oa"
- }
- },
- {
- "type": "block-dirty-bitmap-disable",
- "data": {
- "node": "libvirt-2-format",
- "name": "ob"
- }
- }
-]
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-2-format",
- "name": "current",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-2-format",
- "target": "current",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-enable",
- "data": {
- "node": "libvirt-2-format",
- "name": "oa"
- }
- },
- {
- "type": "block-dirty-bitmap-enable",
- "data": {
- "node": "libvirt-2-format",
- "name": "ob"
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
deleted file mode 100644
index fec6f95dd1..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
+++ /dev/null
@@ -1,112 +0,0 @@
-pre job bitmap disable:
-[
- {
- "type": "block-dirty-bitmap-disable",
- "data": {
- "node": "libvirt-3-format",
- "name": "b"
- }
- }
-]
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-enable",
- "data": {
- "node": "libvirt-3-format",
- "name": "b"
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-3-format",
- "name": "current",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "current",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-3-format",
- "name": "c",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-3-format",
- "name": "oa",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "oa",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "oa"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-3-format",
- "name": "ob",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "ob",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "ob"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
deleted file mode 100644
index 697230f67b..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
+++ /dev/null
@@ -1,119 +0,0 @@
-pre job bitmap disable:
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "b",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "current",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "current",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "c",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "oa",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "oa",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "oa"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "ob",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "ob",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "ob"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
deleted file mode 100644
index 6bf1f0da64..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
+++ /dev/null
@@ -1,119 +0,0 @@
-pre job bitmap disable:
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "b",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "current",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "current",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "c",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "oa",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "oa",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "oa"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "ob",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "ob",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "ob"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
deleted file mode 100644
index f202bb94b1..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
+++ /dev/null
@@ -1,89 +0,0 @@
-pre job bitmap disable:
-[
- {
- "type": "block-dirty-bitmap-disable",
- "data": {
- "node": "libvirt-3-format",
- "name": "b"
- }
- }
-]
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-enable",
- "data": {
- "node": "libvirt-3-format",
- "name": "b"
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-3-format",
- "name": "c",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-3-format",
- "name": "oa",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "oa",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "oa"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-3-format",
- "name": "ob",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "ob",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "ob"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
deleted file mode 100644
index 864cc9041b..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
+++ /dev/null
@@ -1,96 +0,0 @@
-pre job bitmap disable:
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "b",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "c",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "oa",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "oa",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "oa"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "ob",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "ob",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "ob"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
deleted file mode 100644
index 4c5d8dbe80..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
+++ /dev/null
@@ -1,96 +0,0 @@
-pre job bitmap disable:
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "b",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "c",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "oa",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "oa",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "oa"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "ob",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "ob",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "ob"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4
deleted file mode 100644
index 367a930a74..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4
+++ /dev/null
@@ -1,27 +0,0 @@
-pre job bitmap disable:
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-4-format",
- "name": "b",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-4-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "b"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5
deleted file mode 100644
index 0062ec140c..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5
+++ /dev/null
@@ -1,27 +0,0 @@
-pre job bitmap disable:
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-5-format",
- "name": "b",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-5-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "b"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5
deleted file mode 100644
index b1f10a8a24..0000000000
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5
+++ /dev/null
@@ -1,20 +0,0 @@
-pre job bitmap disable:
-[
- {
- "type": "block-dirty-bitmap-disable",
- "data": {
- "node": "libvirt-5-format",
- "name": "a"
- }
- }
-]
-merge bitmpas:
-[
- {
- "type": "block-dirty-bitmap-enable",
- "data": {
- "node": "libvirt-5-format",
- "name": "a"
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcopy/basic-deep-out.json b/tests/qemublocktestdata/bitmapblockcopy/basic-deep-out.json
deleted file mode 100644
index 4ed2b97e95..0000000000
--- a/tests/qemublocktestdata/bitmapblockcopy/basic-deep-out.json
+++ /dev/null
@@ -1,117 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "mirror-format-node",
- "name": "a",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "mirror-format-node",
- "target": "a",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "a"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "mirror-format-node",
- "name": "b",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "mirror-format-node",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "mirror-format-node",
- "name": "current",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "mirror-format-node",
- "target": "current",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "mirror-format-node",
- "name": "c",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "mirror-format-node",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "mirror-format-node",
- "name": "d",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "mirror-format-node",
- "target": "d",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "d"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcopy/basic-shallow-out.json b/tests/qemublocktestdata/bitmapblockcopy/basic-shallow-out.json
deleted file mode 100644
index 4ed2b97e95..0000000000
--- a/tests/qemublocktestdata/bitmapblockcopy/basic-shallow-out.json
+++ /dev/null
@@ -1,117 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "mirror-format-node",
- "name": "a",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "mirror-format-node",
- "target": "a",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "a"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "mirror-format-node",
- "name": "b",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "mirror-format-node",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "mirror-format-node",
- "name": "current",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "mirror-format-node",
- "target": "current",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "mirror-format-node",
- "name": "c",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "mirror-format-node",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "mirror-format-node",
- "name": "d",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "mirror-format-node",
- "target": "d",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "d"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcopy/snapshots-deep-out.json b/tests/qemublocktestdata/bitmapblockcopy/snapshots-deep-out.json
deleted file mode 100644
index 5456553d78..0000000000
--- a/tests/qemublocktestdata/bitmapblockcopy/snapshots-deep-out.json
+++ /dev/null
@@ -1,133 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "mirror-format-node",
- "name": "a",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "mirror-format-node",
- "target": "a",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "a"
- },
- {
- "node": "libvirt-4-format",
- "name": "a"
- },
- {
- "node": "libvirt-5-format",
- "name": "a"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "mirror-format-node",
- "name": "b",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "mirror-format-node",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "mirror-format-node",
- "name": "current",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "mirror-format-node",
- "target": "current",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "mirror-format-node",
- "name": "c",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "mirror-format-node",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "c"
- },
- {
- "node": "libvirt-3-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "mirror-format-node",
- "name": "d",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "mirror-format-node",
- "target": "d",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "d"
- },
- {
- "node": "libvirt-2-format",
- "name": "d"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/bitmapblockcopy/snapshots-shallow-out.json b/tests/qemublocktestdata/bitmapblockcopy/snapshots-shallow-out.json
deleted file mode 100644
index ddd47f7ee1..0000000000
--- a/tests/qemublocktestdata/bitmapblockcopy/snapshots-shallow-out.json
+++ /dev/null
@@ -1,48 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "mirror-format-node",
- "name": "current",
- "persistent": true,
- "disabled": false,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "mirror-format-node",
- "target": "current",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "mirror-format-node",
- "name": "d",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "mirror-format-node",
- "target": "d",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "d"
- }
- ]
- }
- }
-]
diff --git a/tests/qemublocktestdata/checkpointdelete/basic-current-out.json b/tests/qemublocktestdata/checkpointdelete/basic-current-out.json
deleted file mode 100644
index 1b607567e8..0000000000
--- a/tests/qemublocktestdata/checkpointdelete/basic-current-out.json
+++ /dev/null
@@ -1,29 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-enable",
- "data": {
- "node": "libvirt-1-format",
- "name": "d"
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-1-format",
- "target": "d",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-1-format",
- "name": "current"
- }
- }
-]
diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
deleted file mode 100644
index eccb7ed15f..0000000000
--- a/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-1-format",
- "target": "a",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-1-format",
- "name": "b"
- }
- }
-]
diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
deleted file mode 100644
index de40e4b5b0..0000000000
--- a/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-1-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-1-format",
- "name": "c"
- }
- }
-]
diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
deleted file mode 100644
index b5d85f43f0..0000000000
--- a/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-1-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "d"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-1-format",
- "name": "d"
- }
- }
-]
diff --git a/tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json b/tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json
deleted file mode 100644
index e87382fdb4..0000000000
--- a/tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-1-format",
- "name": "a"
- }
- }
-]
diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json
deleted file mode 100644
index 1b607567e8..0000000000
--- a/tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json
+++ /dev/null
@@ -1,29 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-enable",
- "data": {
- "node": "libvirt-1-format",
- "name": "d"
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-1-format",
- "target": "d",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-1-format",
- "name": "current"
- }
- }
-]
diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
deleted file mode 100644
index c9bda3a17a..0000000000
--- a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
+++ /dev/null
@@ -1,24 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "a",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-3-format",
- "name": "b"
- }
- }
-]
-reopen nodes:
-libvirt-3-format
diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
deleted file mode 100644
index 8a0e3f2cff..0000000000
--- a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
+++ /dev/null
@@ -1,62 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-2-format",
- "name": "b",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-2-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-2-format",
- "name": "c"
- }
- },
- {
- "type": "block-dirty-bitmap-enable",
- "data": {
- "node": "libvirt-3-format",
- "name": "b"
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-3-format",
- "name": "c"
- }
- }
-]
-reopen nodes:
-libvirt-3-format
-libvirt-2-format
diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
deleted file mode 100644
index 211bc40baf..0000000000
--- a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
+++ /dev/null
@@ -1,61 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-1-format",
- "name": "c",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-1-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "d"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-1-format",
- "name": "d"
- }
- },
- {
- "type": "block-dirty-bitmap-enable",
- "data": {
- "node": "libvirt-2-format",
- "name": "c"
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-2-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "d"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-2-format",
- "name": "d"
- }
- }
-]
-reopen nodes:
-libvirt-2-format
diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
deleted file mode 100644
index f750f44da2..0000000000
--- a/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
+++ /dev/null
@@ -1,27 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-3-format",
- "name": "a"
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-4-format",
- "name": "a"
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-5-format",
- "name": "a"
- }
- }
-]
-reopen nodes:
-libvirt-5-format
-libvirt-4-format
-libvirt-3-format
diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-current-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-current-out.json
deleted file mode 100644
index 1b607567e8..0000000000
--- a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-current-out.json
+++ /dev/null
@@ -1,29 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-enable",
- "data": {
- "node": "libvirt-1-format",
- "name": "d"
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-1-format",
- "target": "d",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "current"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-1-format",
- "name": "current"
- }
- }
-]
diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json
deleted file mode 100644
index d7e6d18637..0000000000
--- a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json
+++ /dev/null
@@ -1,31 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-enable",
- "data": {
- "node": "libvirt-3-format",
- "name": "a"
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-3-format",
- "target": "a",
- "bitmaps": [
- {
- "node": "libvirt-3-format",
- "name": "b"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-3-format",
- "name": "b"
- }
- }
-]
-reopen nodes:
-libvirt-3-format
diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json
deleted file mode 100644
index cfbff010c2..0000000000
--- a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json
+++ /dev/null
@@ -1,34 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-2-format",
- "name": "b",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-2-format",
- "target": "b",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "c"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-2-format",
- "name": "c"
- }
- }
-]
-reopen nodes:
-libvirt-2-format
diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json
deleted file mode 100644
index 211bc40baf..0000000000
--- a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json
+++ /dev/null
@@ -1,61 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-add",
- "data": {
- "node": "libvirt-1-format",
- "name": "c",
- "persistent": true,
- "disabled": true,
- "granularity": 65536
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-1-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-1-format",
- "name": "d"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-1-format",
- "name": "d"
- }
- },
- {
- "type": "block-dirty-bitmap-enable",
- "data": {
- "node": "libvirt-2-format",
- "name": "c"
- }
- },
- {
- "type": "block-dirty-bitmap-merge",
- "data": {
- "node": "libvirt-2-format",
- "target": "c",
- "bitmaps": [
- {
- "node": "libvirt-2-format",
- "name": "d"
- }
- ]
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-2-format",
- "name": "d"
- }
- }
-]
-reopen nodes:
-libvirt-2-format
diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json
deleted file mode 100644
index f750f44da2..0000000000
--- a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json
+++ /dev/null
@@ -1,27 +0,0 @@
-[
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-3-format",
- "name": "a"
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-4-format",
- "name": "a"
- }
- },
- {
- "type": "block-dirty-bitmap-remove",
- "data": {
- "node": "libvirt-5-format",
- "name": "a"
- }
- }
-]
-reopen nodes:
-libvirt-5-format
-libvirt-4-format
-libvirt-3-format
--
2.27.0
Reference in New Issue View Git Blame Copy Permalink