qemublocktest: Disable testcases for all bitmap handling

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>

diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index d66e169fd8f267c79971e9d5939f89967c3ad9cc..d2f105486e68ddb0ab1648e8e09488a9a3a7ba1d 100644 (file)
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -1312,14 +1312,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; \
@@ -1334,24 +1326,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; \
@@ -1366,36 +1340,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; \
@@ -1411,12 +1355,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 {\
@@ -1432,38 +1370,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 (file)
index 28c3d16..0000000
--- 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 (file)
index b89252e..0000000
--- 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 (file)
index 0dffcaf..0000000
--- 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 (file)
index 526fc8d..0000000
--- 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 (file)
index b89252e..0000000
--- 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 (file)
index 537d776..0000000
--- 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 (file)
index 8eeb4c3..0000000
--- 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 (file)
index 71b48e3..0000000
--- 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 (file)
index bfc58f9..0000000
--- 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 (file)
index 0015b9c..0000000
--- 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 (file)
index 5691b40..0000000
--- 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 (file)
index 4540015..0000000
--- 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 (file)
index 2fd43d7..0000000
--- 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 (file)
index d719a90..0000000
--- 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 (file)
index 9e37962..0000000
--- 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 (file)
index d6b20a5..0000000
--- 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 (file)
index b96e891..0000000
--- 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 (file)
index 9570c34..0000000
--- 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 (file)
index 7e1020d..0000000
--- 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 (file)
index 463120d..0000000
--- 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 (file)
index fec6f95..0000000
--- 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 (file)
index 697230f..0000000
--- 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 (file)
index 6bf1f0d..0000000
--- 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 (file)
index f202bb9..0000000
--- 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 (file)
index 864cc90..0000000
--- 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 (file)
index 4c5d8db..0000000
--- 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 (file)
index 367a930..0000000
--- 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 (file)
index 0062ec1..0000000
--- 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 (file)
index b1f10a8..0000000
--- 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 (file)
index 4ed2b97..0000000
--- 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 (file)
index 4ed2b97..0000000
--- 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 (file)
index 5456553..0000000
--- 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 (file)
index ddd47f7..0000000
--- 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 (file)
index 1b60756..0000000
--- 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 (file)
index eccb7ed..0000000
--- 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 (file)
index de40e4b..0000000
--- 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 (file)
index b5d85f4..0000000
--- 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 (file)
index e87382f..0000000
--- 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 (file)
index 1b60756..0000000
--- 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 (file)
index c9bda3a..0000000
--- 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 (file)
index 8a0e3f2..0000000
--- 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 (file)
index 211bc40..0000000
--- 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 (file)
index f750f44..0000000
--- 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 (file)
index 1b60756..0000000
--- 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 (file)
index d7e6d18..0000000
--- 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 (file)
index cfbff01..0000000
--- 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 (file)
index 211bc40..0000000
--- 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 (file)
index f750f44..0000000
--- 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