[PATCH 35/80] qemu: block: Remove 'qemuBlockNodeNamesDetect' and related infrastructure

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



With blockdev we are generating the nodenames ourselves so all of this
infrastructrure became obsolete. Remove it.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/qemu/qemu_block.c                         | 274 -------
 src/qemu/qemu_block.h                         |   9 -
 ...monitorjson-nodename-basic-blockstats.json | 166 -----
 ...onitorjson-nodename-basic-named-nodes.json | 268 -------
 .../qemumonitorjson-nodename-basic.result     |  16 -
 ...itorjson-nodename-blockjob-blockstats.json | 301 --------
 ...torjson-nodename-blockjob-named-nodes.json | 682 ------------------
 .../qemumonitorjson-nodename-blockjob.result  |  26 -
 ...monitorjson-nodename-empty-blockstats.json |   2 -
 ...onitorjson-nodename-empty-named-nodes.json |   2 -
 .../qemumonitorjson-nodename-empty.result     |   0
 ...nitorjson-nodename-gluster-blockstats.json | 111 ---
 ...itorjson-nodename-gluster-named-nodes.json | 135 ----
 .../qemumonitorjson-nodename-gluster.result   |  11 -
 ...monitorjson-nodename-iscsi-blockstats.json | 113 ---
 ...onitorjson-nodename-iscsi-named-nodes.json | 114 ---
 .../qemumonitorjson-nodename-iscsi.result     |  13 -
 ...umonitorjson-nodename-luks-blockstats.json |  58 --
 ...monitorjson-nodename-luks-named-nodes.json | 109 ---
 .../qemumonitorjson-nodename-luks.result      |   6 -
 ...mumonitorjson-nodename-old-blockstats.json | 160 ----
 ...umonitorjson-nodename-old-named-nodes.json |   2 -
 .../qemumonitorjson-nodename-old.result       |   0
 ...itorjson-nodename-relative-blockstats.json | 329 ---------
 ...torjson-nodename-relative-named-nodes.json | 554 --------------
 .../qemumonitorjson-nodename-relative.result  |  33 -
 ...json-nodename-same-backing-blockstats.json | 221 ------
 ...son-nodename-same-backing-named-nodes.json | 316 --------
 ...mumonitorjson-nodename-same-backing.result |  23 -
 tests/qemumonitorjsontest.c                   |  92 ---
 30 files changed, 4146 deletions(-)
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 141bf1b3e7..ea0b783bbb 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -70,280 +70,6 @@ qemuBlockNamedNodesArrayToHash(size_t pos G_GNUC_UNUSED,
 }


-static void
-qemuBlockNodeNameBackingChainDataFree(qemuBlockNodeNameBackingChainData *data)
-{
-    if (!data)
-        return;
-
-    g_free(data->nodeformat);
-    g_free(data->nodestorage);
-
-    g_free(data->qemufilename);
-
-    g_free(data->drvformat);
-    g_free(data->drvstorage);
-
-    qemuBlockNodeNameBackingChainDataFree(data->backing);
-
-    g_free(data);
-}
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockNodeNameBackingChainData,
-                        qemuBlockNodeNameBackingChainDataFree);
-
-
-static void
-qemuBlockNodeNameBackingChainDataHashEntryFree(void *opaque)
-{
-    qemuBlockNodeNameBackingChainDataFree(opaque);
-}
-
-
-/* list of driver names of layers that qemu automatically adds into the
- * backing chain */
-static const char *qemuBlockDriversBlockjob[] = {
-    "mirror_top", "commit_top", NULL };
-
-static bool
-qemuBlockDriverMatch(const char *drvname,
-                     const char **drivers)
-{
-    while (*drivers) {
-        if (STREQ(drvname, *drivers))
-            return true;
-
-        drivers++;
-    }
-
-    return false;
-}
-
-
-struct qemuBlockNodeNameGetBackingChainData {
-    GHashTable *nodenamestable;
-    GHashTable *disks;
-};
-
-
-static int
-qemuBlockNodeNameGetBackingChainBacking(virJSONValue *next,
-                                        GHashTable *nodenamestable,
-                                        qemuBlockNodeNameBackingChainData **nodenamedata)
-{
-    g_autoptr(qemuBlockNodeNameBackingChainData) data = NULL;
-    qemuBlockNodeNameBackingChainData *backingdata = NULL;
-    virJSONValue *backing = virJSONValueObjectGetObject(next, "backing");
-    virJSONValue *parent = virJSONValueObjectGetObject(next, "parent");
-    virJSONValue *parentnodedata;
-    virJSONValue *nodedata;
-    const char *nodename = virJSONValueObjectGetString(next, "node-name");
-    const char *drvname = NULL;
-    const char *drvparent = NULL;
-    const char *parentnodename = NULL;
-    const char *filename = NULL;
-
-    if (!nodename)
-        return 0;
-
-    if ((nodedata = virHashLookup(nodenamestable, nodename)) &&
-        (drvname = virJSONValueObjectGetString(nodedata, "drv"))) {
-
-        /* qemu 2.9 reports layers in the backing chain which don't correspond
-         * to files. skip them */
-        if (qemuBlockDriverMatch(drvname, qemuBlockDriversBlockjob)) {
-            if (backing) {
-                return qemuBlockNodeNameGetBackingChainBacking(backing,
-                                                               nodenamestable,
-                                                               nodenamedata);
-            } else {
-                return 0;
-            }
-        }
-    }
-
-    if (parent &&
-        (parentnodename = virJSONValueObjectGetString(parent, "node-name"))) {
-        if ((parentnodedata = virHashLookup(nodenamestable, parentnodename))) {
-            filename = virJSONValueObjectGetString(parentnodedata, "file");
-            drvparent = virJSONValueObjectGetString(parentnodedata, "drv");
-        }
-    }
-
-    data = g_new0(qemuBlockNodeNameBackingChainData, 1);
-
-    data->nodeformat = g_strdup(nodename);
-    data->nodestorage = g_strdup(parentnodename);
-    data->qemufilename = g_strdup(filename);
-    data->drvformat = g_strdup(drvname);
-    data->drvstorage = g_strdup(drvparent);
-
-    if (backing &&
-        qemuBlockNodeNameGetBackingChainBacking(backing, nodenamestable,
-                                                &backingdata) < 0)
-        return -1;
-
-    data->backing = g_steal_pointer(&backingdata);
-    *nodenamedata = g_steal_pointer(&data);
-
-    return 0;
-}
-
-
-static int
-qemuBlockNodeNameGetBackingChainDisk(size_t pos G_GNUC_UNUSED,
-                                     virJSONValue *item,
-                                     void *opaque)
-{
-    struct qemuBlockNodeNameGetBackingChainData *data = opaque;
-    const char *device = virJSONValueObjectGetString(item, "device");
-    g_autoptr(qemuBlockNodeNameBackingChainData) devicedata = NULL;
-
-    if (qemuBlockNodeNameGetBackingChainBacking(item, data->nodenamestable,
-                                                &devicedata) < 0)
-        return -1;
-
-    if (devicedata &&
-        virHashAddEntry(data->disks, device, devicedata) < 0)
-        return -1;
-
-    devicedata = NULL;
-    return 1; /* we don't really want to steal @item */
-}
-
-
-/**
- * qemuBlockNodeNameGetBackingChain:
- * @namednodes: JSON array of data returned from 'query-named-block-nodes'
- * @blockstats: JSON array of data returned from 'query-blockstats'
- *
- * Tries to reconstruct the backing chain from @json to allow detection of
- * node names that were auto-assigned by qemu. This is a best-effort operation
- * and may not be successful. The returned hash table contains the entries as
- * qemuBlockNodeNameBackingChainData *accessible by the node name. The fields
- * then can be used to recover the full backing chain.
- *
- * Returns a hash table on success and NULL on failure.
- */
-GHashTable *
-qemuBlockNodeNameGetBackingChain(virJSONValue *namednodes,
-                                 virJSONValue *blockstats)
-{
-    g_autoptr(GHashTable) namednodestable = virHashNew(virJSONValueHashFree);
-    g_autoptr(GHashTable) disks = virHashNew(qemuBlockNodeNameBackingChainDataHashEntryFree);
-    struct qemuBlockNodeNameGetBackingChainData data = { .nodenamestable = namednodestable,
-                                                         .disks = disks };
-
-    if (virJSONValueArrayForeachSteal(namednodes,
-                                      qemuBlockNamedNodesArrayToHash,
-                                      namednodestable) < 0)
-        return NULL;
-
-    if (virJSONValueArrayForeachSteal(blockstats,
-                                      qemuBlockNodeNameGetBackingChainDisk,
-                                      &data) < 0)
-        return NULL;
-
-    return g_steal_pointer(&disks);
-}
-
-
-static void
-qemuBlockDiskClearDetectedNodes(virDomainDiskDef *disk)
-{
-    virStorageSource *next = disk->src;
-
-    while (virStorageSourceIsBacking(next)) {
-        VIR_FREE(next->nodeformat);
-        VIR_FREE(next->nodestorage);
-
-        next = next->backingStore;
-    }
-}
-
-
-static int
-qemuBlockDiskDetectNodes(virDomainDiskDef *disk,
-                         GHashTable *disktable)
-{
-    qemuBlockNodeNameBackingChainData *entry = NULL;
-    virStorageSource *src = disk->src;
-    g_autofree char *alias = NULL;
-
-    /* don't attempt the detection if the top level already has node names */
-    if (src->nodeformat || src->nodestorage)
-        return 0;
-
-    if (!(alias = qemuAliasDiskDriveFromDisk(disk)))
-        return -1;
-
-    if (!(entry = virHashLookup(disktable, alias)))
-        return 0;
-
-    while (virStorageSourceIsBacking(src) && entry) {
-        if (src->nodeformat || src->nodestorage) {
-            if (STRNEQ_NULLABLE(src->nodeformat, entry->nodeformat) ||
-                STRNEQ_NULLABLE(src->nodestorage, entry->nodestorage))
-                goto error;
-
-            break;
-        } else {
-            src->nodeformat = g_strdup(entry->nodeformat);
-            src->nodestorage = g_strdup(entry->nodestorage);
-        }
-
-        entry = entry->backing;
-        src = src->backingStore;
-    }
-
-    return 0;
-
- error:
-    qemuBlockDiskClearDetectedNodes(disk);
-    return -1;
-}
-
-
-int
-qemuBlockNodeNamesDetect(virQEMUDriver *driver,
-                         virDomainObj *vm,
-                         virDomainAsyncJob asyncJob)
-{
-    qemuDomainObjPrivate *priv = vm->privateData;
-    g_autoptr(GHashTable) disktable = NULL;
-    g_autoptr(virJSONValue) data = NULL;
-    g_autoptr(virJSONValue) blockstats = NULL;
-    virDomainDiskDef *disk;
-    size_t i;
-
-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_NAMED_BLOCK_NODES))
-        return 0;
-
-    if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
-        return -1;
-
-    data = qemuMonitorQueryNamedBlockNodes(qemuDomainGetMonitor(vm));
-    blockstats = qemuMonitorQueryBlockstats(qemuDomainGetMonitor(vm));
-
-    qemuDomainObjExitMonitor(vm);
-
-    if (!data || !blockstats)
-        return -1;
-
-    if (!(disktable = qemuBlockNodeNameGetBackingChain(data, blockstats)))
-        return -1;
-
-    for (i = 0; i < vm->def->ndisks; i++) {
-        disk = vm->def->disks[i];
-
-        if (qemuBlockDiskDetectNodes(disk, disktable) < 0)
-            return -1;
-    }
-
-    return 0;
-}
-
-
 /**
  * qemuBlockGetNodeData:
  * @data: JSON object returned from query-named-block-nodes
diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index b22a541797..134ce41dd5 100644
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -39,15 +39,6 @@ struct qemuBlockNodeNameBackingChainData {
     char *drvstorage;
 };

-GHashTable *
-qemuBlockNodeNameGetBackingChain(virJSONValue *namednodesdata,
-                                 virJSONValue *blockstats);
-
-int
-qemuBlockNodeNamesDetect(virQEMUDriver *driver,
-                         virDomainObj *vm,
-                         virDomainAsyncJob asyncJob);
-
 GHashTable *
 qemuBlockGetNodeData(virJSONValue *data);

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-blockstats.json
deleted file mode 100644
index c3752b4cfe..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-blockstats.json
+++ /dev/null
@@ -1,166 +0,0 @@
-[
-    {
-      "device": "drive-virtio-disk0",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 32899072,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block033"
-      },
-      "stats": {
-        "flush_total_time_ns": 452246313,
-        "wr_highest_offset": 8072282112,
-        "wr_total_time_ns": 4803102521,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 8,
-        "wr_bytes": 6517248,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 11065169148,
-        "flush_operations": 10,
-        "wr_operations": 129,
-        "rd_merged": 77,
-        "rd_bytes": 76399104,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "idle_time_ns": 22663656304,
-        "rd_operations": 4038,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "backing": {
-        "parent": {
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "node-name": "#block220"
-        },
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "backing": {
-          "parent": {
-            "stats": {
-              "flush_total_time_ns": 0,
-              "wr_highest_offset": 0,
-              "wr_total_time_ns": 0,
-              "failed_wr_operations": 0,
-              "failed_rd_operations": 0,
-              "wr_merged": 0,
-              "wr_bytes": 0,
-              "timed_stats": [
-
-              ],
-              "failed_flush_operations": 0,
-              "account_invalid": false,
-              "rd_total_time_ns": 0,
-              "flush_operations": 0,
-              "wr_operations": 0,
-              "rd_merged": 0,
-              "rd_bytes": 0,
-              "invalid_flush_operations": 0,
-              "account_failed": false,
-              "rd_operations": 0,
-              "invalid_wr_operations": 0,
-              "invalid_rd_operations": 0
-            },
-            "node-name": "#block481"
-          },
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "node-name": "#block558"
-        },
-        "node-name": "#block306"
-      },
-      "node-name": "#block187"
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-named-nodes.json
deleted file mode 100644
index ce8fdae70f..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-named-nodes.json
+++ /dev/null
@@ -1,268 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 9663676416,
-        "filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 9665384448,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": true,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block558",
-      "backing_file_depth": 0,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/rhel7.3.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 9665380352,
-        "filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-        "format": "file",
-        "actual-size": 9665384448,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block481",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/rhel7.3.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 9663676416,
-          "filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 9665384448,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": true,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 9663676416,
-        "filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-        "backing-filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block306",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/rhel7.3.qcow2",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/rhel7.3.1483536402",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block220",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/rhel7.3.1483536402",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "backing-image": {
-            "virtual-size": 9663676416,
-            "filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-            "cluster-size": 65536,
-            "format": "qcow2",
-            "actual-size": 9665384448,
-            "format-specific": {
-              "type": "qcow2",
-              "data": {
-                "compat": "1.1",
-                "lazy-refcounts": true,
-                "refcount-bits": 16,
-                "corrupt": false
-              }
-            },
-            "dirty-flag": false
-          },
-          "backing-filename-format": "qcow2",
-          "virtual-size": 9663676416,
-          "filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "full-backing-filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-          "backing-filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 9663676416,
-        "filename": "/var/lib/libvirt/images/rhel7.3.1483545313",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 33165312,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
-        "backing-filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block187",
-      "backing_file_depth": 2,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/rhel7.3.1483536402",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/rhel7.3.1483545313",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 33226752,
-        "filename": "/var/lib/libvirt/images/rhel7.3.1483545313",
-        "format": "file",
-        "actual-size": 33165312,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block033",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/rhel7.3.1483545313",
-      "encryption_key_missing": false
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result
deleted file mode 100644
index ad8b9b46ed..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result
+++ /dev/null
@@ -1,16 +0,0 @@
-drive-virtio-disk0
-filename    : '/var/lib/libvirt/images/rhel7.3.1483545313'
-format node : '#block187'
-format drv  : 'qcow2'
-storage node: '#block033'
-storage drv : 'file'
-  filename    : '/var/lib/libvirt/images/rhel7.3.1483536402'
-  format node : '#block306'
-  format drv  : 'qcow2'
-  storage node: '#block220'
-  storage drv : 'file'
-    filename    : '/var/lib/libvirt/images/rhel7.3.qcow2'
-    format node : '#block558'
-    format drv  : 'qcow2'
-    storage node: '#block481'
-    storage drv : 'file'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-blockstats.json
deleted file mode 100644
index 51cd664c20..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-blockstats.json
+++ /dev/null
@@ -1,301 +0,0 @@
-[
-    {
-      "device": "drive-ide0-0-0",
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 99763,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 512,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "idle_time_ns": 1142142388760097,
-        "rd_operations": 1,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "backing": {
-        "parent": {
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "node-name": "#block042"
-        },
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "backing": {
-          "parent": {
-            "stats": {
-              "flush_total_time_ns": 0,
-              "wr_highest_offset": 0,
-              "wr_total_time_ns": 0,
-              "failed_wr_operations": 0,
-              "failed_rd_operations": 0,
-              "wr_merged": 0,
-              "wr_bytes": 0,
-              "timed_stats": [
-
-              ],
-              "failed_flush_operations": 0,
-              "account_invalid": false,
-              "rd_total_time_ns": 0,
-              "flush_operations": 0,
-              "wr_operations": 0,
-              "rd_merged": 0,
-              "rd_bytes": 0,
-              "invalid_flush_operations": 0,
-              "account_failed": false,
-              "rd_operations": 0,
-              "invalid_wr_operations": 0,
-              "invalid_rd_operations": 0
-            },
-            "node-name": "#block259"
-          },
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "backing": {
-            "parent": {
-              "stats": {
-                "flush_total_time_ns": 0,
-                "wr_highest_offset": 0,
-                "wr_total_time_ns": 0,
-                "failed_wr_operations": 0,
-                "failed_rd_operations": 0,
-                "wr_merged": 0,
-                "wr_bytes": 0,
-                "timed_stats": [
-
-                ],
-                "failed_flush_operations": 0,
-                "account_invalid": false,
-                "rd_total_time_ns": 0,
-                "flush_operations": 0,
-                "wr_operations": 0,
-                "rd_merged": 0,
-                "rd_bytes": 0,
-                "invalid_flush_operations": 0,
-                "account_failed": false,
-                "rd_operations": 0,
-                "invalid_wr_operations": 0,
-                "invalid_rd_operations": 0
-              },
-              "node-name": "#block449"
-            },
-            "stats": {
-              "flush_total_time_ns": 0,
-              "wr_highest_offset": 0,
-              "wr_total_time_ns": 0,
-              "failed_wr_operations": 0,
-              "failed_rd_operations": 0,
-              "wr_merged": 0,
-              "wr_bytes": 0,
-              "timed_stats": [
-
-              ],
-              "failed_flush_operations": 0,
-              "account_invalid": false,
-              "rd_total_time_ns": 0,
-              "flush_operations": 0,
-              "wr_operations": 0,
-              "rd_merged": 0,
-              "rd_bytes": 0,
-              "invalid_flush_operations": 0,
-              "account_failed": false,
-              "rd_operations": 0,
-              "invalid_wr_operations": 0,
-              "invalid_rd_operations": 0
-            },
-            "backing": {
-              "parent": {
-                "stats": {
-                  "flush_total_time_ns": 0,
-                  "wr_highest_offset": 0,
-                  "wr_total_time_ns": 0,
-                  "failed_wr_operations": 0,
-                  "failed_rd_operations": 0,
-                  "wr_merged": 0,
-                  "wr_bytes": 0,
-                  "timed_stats": [
-
-                  ],
-                  "failed_flush_operations": 0,
-                  "account_invalid": false,
-                  "rd_total_time_ns": 0,
-                  "flush_operations": 0,
-                  "wr_operations": 0,
-                  "rd_merged": 0,
-                  "rd_bytes": 0,
-                  "invalid_flush_operations": 0,
-                  "account_failed": false,
-                  "rd_operations": 0,
-                  "invalid_wr_operations": 0,
-                  "invalid_rd_operations": 0
-                },
-                "node-name": "#block618"
-              },
-              "stats": {
-                "flush_total_time_ns": 0,
-                "wr_highest_offset": 0,
-                "wr_total_time_ns": 0,
-                "failed_wr_operations": 0,
-                "failed_rd_operations": 0,
-                "wr_merged": 0,
-                "wr_bytes": 0,
-                "timed_stats": [
-
-                ],
-                "failed_flush_operations": 0,
-                "account_invalid": false,
-                "rd_total_time_ns": 0,
-                "flush_operations": 0,
-                "wr_operations": 0,
-                "rd_merged": 0,
-                "rd_bytes": 0,
-                "invalid_flush_operations": 0,
-                "account_failed": false,
-                "rd_operations": 0,
-                "invalid_wr_operations": 0,
-                "invalid_rd_operations": 0
-              },
-              "backing": {
-                "parent": {
-                  "stats": {
-                    "flush_total_time_ns": 0,
-                    "wr_highest_offset": 0,
-                    "wr_total_time_ns": 0,
-                    "failed_wr_operations": 0,
-                    "failed_rd_operations": 0,
-                    "wr_merged": 0,
-                    "wr_bytes": 0,
-                    "timed_stats": [
-
-                    ],
-                    "failed_flush_operations": 0,
-                    "account_invalid": false,
-                    "rd_total_time_ns": 0,
-                    "flush_operations": 0,
-                    "wr_operations": 0,
-                    "rd_merged": 0,
-                    "rd_bytes": 0,
-                    "invalid_flush_operations": 0,
-                    "account_failed": false,
-                    "rd_operations": 0,
-                    "invalid_wr_operations": 0,
-                    "invalid_rd_operations": 0
-                  },
-                  "node-name": "#block846"
-                },
-                "stats": {
-                  "flush_total_time_ns": 0,
-                  "wr_highest_offset": 0,
-                  "wr_total_time_ns": 0,
-                  "failed_wr_operations": 0,
-                  "failed_rd_operations": 0,
-                  "wr_merged": 0,
-                  "wr_bytes": 0,
-                  "timed_stats": [
-
-                  ],
-                  "failed_flush_operations": 0,
-                  "account_invalid": false,
-                  "rd_total_time_ns": 0,
-                  "flush_operations": 0,
-                  "wr_operations": 0,
-                  "rd_merged": 0,
-                  "rd_bytes": 0,
-                  "invalid_flush_operations": 0,
-                  "account_failed": false,
-                  "rd_operations": 0,
-                  "invalid_wr_operations": 0,
-                  "invalid_rd_operations": 0
-                },
-                "node-name": "#block901"
-              },
-              "node-name": "#block717"
-            },
-            "node-name": "#block551"
-          },
-          "node-name": "#block312"
-        },
-        "node-name": "#block179"
-      },
-      "node-name": "#block3343"
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-named-nodes.json
deleted file mode 100644
index 3cebb23a94..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-named-nodes.json
+++ /dev/null
@@ -1,682 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "backing-image": {
-            "backing-image": {
-              "backing-image": {
-                "backing-image": {
-                  "virtual-size": 10485760,
-                  "filename": "/var/lib/libvirt/images/a",
-                  "format": "raw",
-                  "actual-size": 0,
-                  "dirty-flag": false
-                },
-                "backing-filename-format": "raw",
-                "virtual-size": 10485760,
-                "filename": "/var/lib/libvirt/images/c",
-                "cluster-size": 65536,
-                "format": "qcow2",
-                "actual-size": 200704,
-                "format-specific": {
-                  "type": "qcow2",
-                  "data": {
-                    "compat": "1.1",
-                    "lazy-refcounts": false,
-                    "refcount-bits": 16,
-                    "corrupt": false
-                  }
-                },
-                "full-backing-filename": "/var/lib/libvirt/images/a",
-                "backing-filename": "/var/lib/libvirt/images/a",
-                "dirty-flag": false
-              },
-              "backing-filename-format": "qcow2",
-              "virtual-size": 10485760,
-              "filename": "/var/lib/libvirt/images/d",
-              "cluster-size": 65536,
-              "format": "qcow2",
-              "actual-size": 200704,
-              "format-specific": {
-                "type": "qcow2",
-                "data": {
-                  "compat": "1.1",
-                  "lazy-refcounts": false,
-                  "refcount-bits": 16,
-                  "corrupt": false
-                }
-              },
-              "full-backing-filename": "/var/lib/libvirt/images/c",
-              "backing-filename": "/var/lib/libvirt/images/c",
-              "dirty-flag": false
-            },
-            "backing-filename-format": "qcow2",
-            "virtual-size": 10485760,
-            "filename": "/var/lib/libvirt/images/d.1499152668",
-            "cluster-size": 65536,
-            "format": "qcow2",
-            "actual-size": 200704,
-            "format-specific": {
-              "type": "qcow2",
-              "data": {
-                "compat": "1.1",
-                "lazy-refcounts": false,
-                "refcount-bits": 16,
-                "corrupt": false
-              }
-            },
-            "full-backing-filename": "/var/lib/libvirt/images/d",
-            "backing-filename": "/var/lib/libvirt/images/d",
-            "dirty-flag": false
-          },
-          "backing-filename-format": "qcow2",
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/d.1499152698",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "full-backing-filename": "/var/lib/libvirt/images/d.1499152668",
-          "backing-filename": "/var/lib/libvirt/images/d.1499152668",
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/d.1499152698",
-        "format": "mirror_top",
-        "full-backing-filename": "/var/lib/libvirt/images/d.1499152698",
-        "backing-filename": "/var/lib/libvirt/images/d.1499152698"
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block3343",
-      "backing_file_depth": 5,
-      "drv": "mirror_top",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/d.1499152698",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/d.1499152698",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/tmp/kkt",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 266240,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block3243",
-      "backing_file_depth": 0,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/tmp/kkt",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 327680,
-        "filename": "/tmp/kkt",
-        "format": "file",
-        "actual-size": 266240,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block3144",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/tmp/kkt",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/a",
-        "format": "raw",
-        "actual-size": 0,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block901",
-      "backing_file_depth": 0,
-      "drv": "raw",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/a",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/a",
-        "format": "file",
-        "actual-size": 0,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block846",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/a",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/a",
-          "format": "raw",
-          "actual-size": 0,
-          "dirty-flag": false
-        },
-        "backing-filename-format": "raw",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/c",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/a",
-        "backing-filename": "/var/lib/libvirt/images/a",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block717",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/a",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/c",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/c",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block618",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/c",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "backing-image": {
-            "virtual-size": 10485760,
-            "filename": "/var/lib/libvirt/images/a",
-            "format": "raw",
-            "actual-size": 0,
-            "dirty-flag": false
-          },
-          "backing-filename-format": "raw",
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/c",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "full-backing-filename": "/var/lib/libvirt/images/a",
-          "backing-filename": "/var/lib/libvirt/images/a",
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/d",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/c",
-        "backing-filename": "/var/lib/libvirt/images/c",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block551",
-      "backing_file_depth": 2,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/c",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/d",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/d",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block449",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/d",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "backing-image": {
-            "backing-image": {
-              "virtual-size": 10485760,
-              "filename": "/var/lib/libvirt/images/a",
-              "format": "raw",
-              "actual-size": 0,
-              "dirty-flag": false
-            },
-            "backing-filename-format": "raw",
-            "virtual-size": 10485760,
-            "filename": "/var/lib/libvirt/images/c",
-            "cluster-size": 65536,
-            "format": "qcow2",
-            "actual-size": 200704,
-            "format-specific": {
-              "type": "qcow2",
-              "data": {
-                "compat": "1.1",
-                "lazy-refcounts": false,
-                "refcount-bits": 16,
-                "corrupt": false
-              }
-            },
-            "full-backing-filename": "/var/lib/libvirt/images/a",
-            "backing-filename": "/var/lib/libvirt/images/a",
-            "dirty-flag": false
-          },
-          "backing-filename-format": "qcow2",
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/d",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "full-backing-filename": "/var/lib/libvirt/images/c",
-          "backing-filename": "/var/lib/libvirt/images/c",
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/d.1499152668",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/d",
-        "backing-filename": "/var/lib/libvirt/images/d",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block312",
-      "backing_file_depth": 3,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/d",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/d.1499152668",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/d.1499152668",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block259",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/d.1499152668",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "backing-image": {
-            "backing-image": {
-              "backing-image": {
-                "virtual-size": 10485760,
-                "filename": "/var/lib/libvirt/images/a",
-                "format": "raw",
-                "actual-size": 0,
-                "dirty-flag": false
-              },
-              "backing-filename-format": "raw",
-              "virtual-size": 10485760,
-              "filename": "/var/lib/libvirt/images/c",
-              "cluster-size": 65536,
-              "format": "qcow2",
-              "actual-size": 200704,
-              "format-specific": {
-                "type": "qcow2",
-                "data": {
-                  "compat": "1.1",
-                  "lazy-refcounts": false,
-                  "refcount-bits": 16,
-                  "corrupt": false
-                }
-              },
-              "full-backing-filename": "/var/lib/libvirt/images/a",
-              "backing-filename": "/var/lib/libvirt/images/a",
-              "dirty-flag": false
-            },
-            "backing-filename-format": "qcow2",
-            "virtual-size": 10485760,
-            "filename": "/var/lib/libvirt/images/d",
-            "cluster-size": 65536,
-            "format": "qcow2",
-            "actual-size": 200704,
-            "format-specific": {
-              "type": "qcow2",
-              "data": {
-                "compat": "1.1",
-                "lazy-refcounts": false,
-                "refcount-bits": 16,
-                "corrupt": false
-              }
-            },
-            "full-backing-filename": "/var/lib/libvirt/images/c",
-            "backing-filename": "/var/lib/libvirt/images/c",
-            "dirty-flag": false
-          },
-          "backing-filename-format": "qcow2",
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/d.1499152668",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "full-backing-filename": "/var/lib/libvirt/images/d",
-          "backing-filename": "/var/lib/libvirt/images/d",
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/d.1499152698",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/d.1499152668",
-        "backing-filename": "/var/lib/libvirt/images/d.1499152668",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block179",
-      "backing_file_depth": 4,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/d.1499152668",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/d.1499152698",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/d.1499152698",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block042",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/d.1499152698",
-      "encryption_key_missing": false
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob.result
deleted file mode 100644
index 4abe6f9347..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob.result
+++ /dev/null
@@ -1,26 +0,0 @@
-drive-ide0-0-0
-filename    : '/var/lib/libvirt/images/d.1499152698'
-format node : '#block179'
-format drv  : 'qcow2'
-storage node: '#block042'
-storage drv : 'file'
-  filename    : '/var/lib/libvirt/images/d.1499152668'
-  format node : '#block312'
-  format drv  : 'qcow2'
-  storage node: '#block259'
-  storage drv : 'file'
-    filename    : '/var/lib/libvirt/images/d'
-    format node : '#block551'
-    format drv  : 'qcow2'
-    storage node: '#block449'
-    storage drv : 'file'
-      filename    : '/var/lib/libvirt/images/c'
-      format node : '#block717'
-      format drv  : 'qcow2'
-      storage node: '#block618'
-      storage drv : 'file'
-        filename    : '/var/lib/libvirt/images/a'
-        format node : '#block901'
-        format drv  : 'raw'
-        storage node: '#block846'
-        storage drv : 'file'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-blockstats.json
deleted file mode 100644
index 0d4f101c7a..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-blockstats.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-named-nodes.json
deleted file mode 100644
index 0d4f101c7a..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-named-nodes.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-empty.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-empty.result
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-blockstats.json
deleted file mode 100644
index 665a6b05bf..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-blockstats.json
+++ /dev/null
@@ -1,111 +0,0 @@
-[
-    {
-      "device": "drive-virtio-disk0",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block282"
-      },
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 0,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 0,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "rd_operations": 0,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "backing": {
-        "parent": {
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "node-name": "#block477"
-        },
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block596"
-      },
-      "node-name": "#block338"
-    }
-  ]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-named-nodes.json
deleted file mode 100644
index e6bd2cfa72..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-named-nodes.json
+++ /dev/null
@@ -1,135 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "gluster://gluster-host/vol0/img0",
-        "format": "raw",
-        "actual-size": 197120
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block596",
-      "backing_file_depth": 0,
-      "drv": "raw",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": true,
-        "writeback": true
-      },
-      "file": "gluster://gluster-host/vol0/img0",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "gluster://gluster-host/vol0/img0",
-        "format": "gluster",
-        "actual-size": 197120
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block477",
-      "backing_file_depth": 0,
-      "drv": "gluster",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": true,
-        "writeback": true
-      },
-      "file": "gluster://gluster-host/vol0/img0",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 197120,
-          "filename": "gluster://gluster-host/vol0/img0",
-          "format": "raw",
-          "actual-size": 197120
-        },
-        "backing-filename-format": "raw",
-        "virtual-size": 197120,
-        "filename": "gluster://gluster-host:24007/vol0/img1",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 197120,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "gluster://gluster-host/vol0/img0",
-        "backing-filename": "gluster://gluster-host/vol0/img0",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block338",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "gluster://gluster-host/vol0/img0",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": true,
-        "writeback": true
-      },
-      "file": "gluster://gluster-host:24007/vol0/img1",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "gluster://gluster-host:24007/vol0/img1",
-        "format": "gluster",
-        "actual-size": 197120
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block282",
-      "backing_file_depth": 0,
-      "drv": "gluster",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": true,
-        "writeback": true
-      },
-      "file": "gluster://gluster-host:24007/vol0/img1",
-      "encryption_key_missing": false
-    }
-  ]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result
deleted file mode 100644
index 6289fdd1ad..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result
+++ /dev/null
@@ -1,11 +0,0 @@
-drive-virtio-disk0
-filename    : 'gluster://gluster-host:24007/vol0/img1'
-format node : '#block338'
-format drv  : 'qcow2'
-storage node: '#block282'
-storage drv : 'gluster'
-  filename    : 'gluster://gluster-host/vol0/img0'
-  format node : '#block596'
-  format drv  : 'raw'
-  storage node: '#block477'
-  storage drv : 'gluster'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-blockstats.json
deleted file mode 100644
index b13386ecbb..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-blockstats.json
+++ /dev/null
@@ -1,113 +0,0 @@
-[
-    {
-      "device": "drive-virtio-disk0",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block038"
-      },
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 995504,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 512,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "idle_time_ns": 117550038551,
-        "rd_operations": 1,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "node-name": "#block169"
-    },
-    {
-      "device": "drive-scsi0-0-1",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block250"
-      },
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 0,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 0,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "rd_operations": 0,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "node-name": "#block301"
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-named-nodes.json
deleted file mode 100644
index 6a04e62c0c..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-named-nodes.json
+++ /dev/null
@@ -1,114 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 1073741824,
-        "filename": "json:{\"driver\": \"raw\", \"file\": {\"lun\": \"0\", \"portal\": \"example.com:3260\", \"driver\": \"iscsi\", \"transport\": \"tcp\", \"target\": \"iqn.2016-09.com.example:server\"}}",
-        "format": "raw",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block301",
-      "backing_file_depth": 0,
-      "drv": "raw",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "json:{\"driver\": \"raw\", \"file\": {\"lun\": \"0\", \"portal\": \"example.com:3260\", \"driver\": \"iscsi\", \"transport\": \"tcp\", \"target\": \"iqn.2016-09.com.example:server\"}}",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 1073741824,
-        "filename": "json:{\"lun\": \"0\", \"portal\": \"example.com:3260\", \"driver\": \"iscsi\", \"transport\": \"tcp\", \"target\": \"iqn.2016-09.com.example:server\"}",
-        "format": "iscsi",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block250",
-      "backing_file_depth": 0,
-      "drv": "iscsi",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "json:{\"lun\": \"0\", \"portal\": \"example.com:3260\", \"driver\": \"iscsi\", \"transport\": \"tcp\", \"target\": \"iqn.2016-09.com.example:server\"}",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 1073741824,
-        "filename": "json:{\"driver\": \"raw\", \"file\": {\"lun\": \"0\", \"portal\": \"example.com:3260\", \"driver\": \"iscsi\", \"transport\": \"tcp\", \"target\": \"iqn.2016-09.com.example:server\"}}",
-        "format": "raw",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block169",
-      "backing_file_depth": 0,
-      "drv": "raw",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "json:{\"driver\": \"raw\", \"file\": {\"lun\": \"0\", \"portal\": \"example.com:3260\", \"driver\": \"iscsi\", \"transport\": \"tcp\", \"target\": \"iqn.2016-09.com.example:server\"}}",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 1073741824,
-        "filename": "json:{\"lun\": \"0\", \"portal\": \"example.com:3260\", \"driver\": \"iscsi\", \"transport\": \"tcp\", \"target\": \"iqn.2016-09.com.example:server\"}",
-        "format": "iscsi",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block038",
-      "backing_file_depth": 0,
-      "drv": "iscsi",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "json:{\"lun\": \"0\", \"portal\": \"example.com:3260\", \"driver\": \"iscsi\", \"transport\": \"tcp\", \"target\": \"iqn.2016-09.com.example:server\"}",
-      "encryption_key_missing": false
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi.result
deleted file mode 100644
index 3ffe553404..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi.result
+++ /dev/null
@@ -1,13 +0,0 @@
-drive-scsi0-0-1
-filename    : 'json:{"lun": "0", "portal": "example.com:3260", "driver": "iscsi", "transport": "tcp", "target": "iqn.2016-09.com.example:server"}'
-format node : '#block301'
-format drv  : 'raw'
-storage node: '#block250'
-storage drv : 'iscsi'
-
-drive-virtio-disk0
-filename    : 'json:{"lun": "0", "portal": "example.com:3260", "driver": "iscsi", "transport": "tcp", "target": "iqn.2016-09.com.example:server"}'
-format node : '#block169'
-format drv  : 'raw'
-storage node: '#block038'
-storage drv : 'iscsi'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-blockstats.json
deleted file mode 100644
index 6f971b2afc..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-blockstats.json
+++ /dev/null
@@ -1,58 +0,0 @@
-[
-    {
-      "device": "drive-virtio-disk0",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block033"
-      },
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 89560,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 512,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "idle_time_ns": 323120536984,
-        "rd_operations": 1,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "node-name": "#block136"
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-named-nodes.json
deleted file mode 100644
index 8de6d6c6af..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-named-nodes.json
+++ /dev/null
@@ -1,109 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "json:{\"driver\": \"luks\", \"file\": {\"driver\": \"file\", \"filename\": \"/var/lib/libvirt/images/luks\"}, \"key-secret\": \"virtio-disk0-luks-secret0\"}",
-        "format": "luks",
-        "actual-size": 262144,
-        "format-specific": {
-          "type": "luks",
-          "data": {
-            "ivgen-alg": "plain64",
-            "hash-alg": "sha256",
-            "cipher-alg": "aes-256",
-            "uuid": "687ef639-c687-40d3-a103-7b4bdaa6e74a",
-            "cipher-mode": "xts",
-            "slots": [
-              {
-                "active": true,
-                "iters": 1886334,
-                "key-offset": 4096,
-                "stripes": 4000
-              },
-              {
-                "active": false,
-                "key-offset": 262144
-              },
-              {
-                "active": false,
-                "key-offset": 520192
-              },
-              {
-                "active": false,
-                "key-offset": 778240
-              },
-              {
-                "active": false,
-                "key-offset": 1036288
-              },
-              {
-                "active": false,
-                "key-offset": 1294336
-              },
-              {
-                "active": false,
-                "key-offset": 1552384
-              },
-              {
-                "active": false,
-                "key-offset": 1810432
-              }
-            ],
-            "payload-offset": 2068480,
-            "master-key-iters": 484865
-          }
-        },
-        "encrypted": true,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block136",
-      "backing_file_depth": 0,
-      "drv": "luks",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": true,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "json:{\"driver\": \"luks\", \"file\": {\"driver\": \"file\", \"filename\": \"/var/lib/libvirt/images/luks\"}, \"key-secret\": \"virtio-disk0-luks-secret0\"}",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 12554240,
-        "filename": "/var/lib/libvirt/images/luks",
-        "format": "file",
-        "actual-size": 262144,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block033",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/luks",
-      "encryption_key_missing": false
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks.result
deleted file mode 100644
index 6a6b375190..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks.result
+++ /dev/null
@@ -1,6 +0,0 @@
-drive-virtio-disk0
-filename    : '/var/lib/libvirt/images/luks'
-format node : '#block136'
-format drv  : 'luks'
-storage node: '#block033'
-storage drv : 'file'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-old-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-old-blockstats.json
deleted file mode 100644
index 26c14f9f26..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-old-blockstats.json
+++ /dev/null
@@ -1,160 +0,0 @@
-[
-    {
-      "device": "drive-virtio-disk0",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 32899072,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        }
-      },
-      "stats": {
-        "flush_total_time_ns": 452246313,
-        "wr_highest_offset": 8072282112,
-        "wr_total_time_ns": 4803102521,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 8,
-        "wr_bytes": 6517248,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 11065169148,
-        "flush_operations": 10,
-        "wr_operations": 129,
-        "rd_merged": 77,
-        "rd_bytes": 76399104,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "idle_time_ns": 22663656304,
-        "rd_operations": 4038,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "backing": {
-        "parent": {
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          }
-        },
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "backing": {
-          "parent": {
-            "stats": {
-              "flush_total_time_ns": 0,
-              "wr_highest_offset": 0,
-              "wr_total_time_ns": 0,
-              "failed_wr_operations": 0,
-              "failed_rd_operations": 0,
-              "wr_merged": 0,
-              "wr_bytes": 0,
-              "timed_stats": [
-
-              ],
-              "failed_flush_operations": 0,
-              "account_invalid": false,
-              "rd_total_time_ns": 0,
-              "flush_operations": 0,
-              "wr_operations": 0,
-              "rd_merged": 0,
-              "rd_bytes": 0,
-              "invalid_flush_operations": 0,
-              "account_failed": false,
-              "rd_operations": 0,
-              "invalid_wr_operations": 0,
-              "invalid_rd_operations": 0
-            }
-          },
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          }
-        }
-      }
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-old-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-old-named-nodes.json
deleted file mode 100644
index 0d4f101c7a..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-old-named-nodes.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-old.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-old.result
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-blockstats.json
deleted file mode 100644
index 9838ad1a7c..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-blockstats.json
+++ /dev/null
@@ -1,329 +0,0 @@
-[
-    {
-      "device": "drive-ide0-0-0",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block092"
-      },
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 61904,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 512,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "idle_time_ns": 309814663943,
-        "rd_operations": 1,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "backing": {
-        "parent": {
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "node-name": "#block232"
-        },
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "backing": {
-          "parent": {
-            "stats": {
-              "flush_total_time_ns": 0,
-              "wr_highest_offset": 0,
-              "wr_total_time_ns": 0,
-              "failed_wr_operations": 0,
-              "failed_rd_operations": 0,
-              "wr_merged": 0,
-              "wr_bytes": 0,
-              "timed_stats": [
-
-              ],
-              "failed_flush_operations": 0,
-              "account_invalid": false,
-              "rd_total_time_ns": 0,
-              "flush_operations": 0,
-              "wr_operations": 0,
-              "rd_merged": 0,
-              "rd_bytes": 0,
-              "invalid_flush_operations": 0,
-              "account_failed": false,
-              "rd_operations": 0,
-              "invalid_wr_operations": 0,
-              "invalid_rd_operations": 0
-            },
-            "node-name": "#block442"
-          },
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "backing": {
-            "parent": {
-              "stats": {
-                "flush_total_time_ns": 0,
-                "wr_highest_offset": 0,
-                "wr_total_time_ns": 0,
-                "failed_wr_operations": 0,
-                "failed_rd_operations": 0,
-                "wr_merged": 0,
-                "wr_bytes": 0,
-                "timed_stats": [
-
-                ],
-                "failed_flush_operations": 0,
-                "account_invalid": false,
-                "rd_total_time_ns": 0,
-                "flush_operations": 0,
-                "wr_operations": 0,
-                "rd_merged": 0,
-                "rd_bytes": 0,
-                "invalid_flush_operations": 0,
-                "account_failed": false,
-                "rd_operations": 0,
-                "invalid_wr_operations": 0,
-                "invalid_rd_operations": 0
-              },
-              "node-name": "#block614"
-            },
-            "stats": {
-              "flush_total_time_ns": 0,
-              "wr_highest_offset": 0,
-              "wr_total_time_ns": 0,
-              "failed_wr_operations": 0,
-              "failed_rd_operations": 0,
-              "wr_merged": 0,
-              "wr_bytes": 0,
-              "timed_stats": [
-
-              ],
-              "failed_flush_operations": 0,
-              "account_invalid": false,
-              "rd_total_time_ns": 0,
-              "flush_operations": 0,
-              "wr_operations": 0,
-              "rd_merged": 0,
-              "rd_bytes": 0,
-              "invalid_flush_operations": 0,
-              "account_failed": false,
-              "rd_operations": 0,
-              "invalid_wr_operations": 0,
-              "invalid_rd_operations": 0
-            },
-            "node-name": "#block797"
-          },
-          "node-name": "#block548"
-        },
-        "node-name": "#block346"
-      },
-      "node-name": "#block118"
-    },
-    {
-      "device": "drive-ide0-0-1",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block1107"
-      },
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 0,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 0,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "rd_operations": 0,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "backing": {
-        "parent": {
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "node-name": "#block800"
-        },
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block927"
-      },
-      "node-name": "#block1290"
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-named-nodes.json
deleted file mode 100644
index 2fcc3b47ed..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-named-nodes.json
+++ /dev/null
@@ -1,554 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/base.qcow2",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/relsnap.qcow2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block1290",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/base.qcow2",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/relsnap.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/relsnap.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block1107",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/relsnap.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/base.qcow2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block927",
-      "backing_file_depth": 0,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/base.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block800",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/img0",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block797",
-      "backing_file_depth": 0,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img0",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/img0",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block614",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img0",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/img0",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/img1",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/img0",
-        "backing-filename": "/var/lib/libvirt/images/img0",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block548",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/img0",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img1",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/img1",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block442",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img1",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "backing-image": {
-            "virtual-size": 10485760,
-            "filename": "/var/lib/libvirt/images/img0",
-            "cluster-size": 65536,
-            "format": "qcow2",
-            "actual-size": 200704,
-            "format-specific": {
-              "type": "qcow2",
-              "data": {
-                "compat": "1.1",
-                "lazy-refcounts": false,
-                "refcount-bits": 16,
-                "corrupt": false
-              }
-            },
-            "dirty-flag": false
-          },
-          "backing-filename-format": "qcow2",
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/img1",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "full-backing-filename": "/var/lib/libvirt/images/img0",
-          "backing-filename": "/var/lib/libvirt/images/img0",
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/img2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/img1",
-        "backing-filename": "/var/lib/libvirt/images/img1",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block346",
-      "backing_file_depth": 2,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/img1",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/img2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block232",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "backing-image": {
-            "backing-image": {
-              "virtual-size": 10485760,
-              "filename": "/var/lib/libvirt/images/img0",
-              "cluster-size": 65536,
-              "format": "qcow2",
-              "actual-size": 200704,
-              "format-specific": {
-                "type": "qcow2",
-                "data": {
-                  "compat": "1.1",
-                  "lazy-refcounts": false,
-                  "refcount-bits": 16,
-                  "corrupt": false
-                }
-              },
-              "dirty-flag": false
-            },
-            "backing-filename-format": "qcow2",
-            "virtual-size": 10485760,
-            "filename": "/var/lib/libvirt/images/img1",
-            "cluster-size": 65536,
-            "format": "qcow2",
-            "actual-size": 200704,
-            "format-specific": {
-              "type": "qcow2",
-              "data": {
-                "compat": "1.1",
-                "lazy-refcounts": false,
-                "refcount-bits": 16,
-                "corrupt": false
-              }
-            },
-            "full-backing-filename": "/var/lib/libvirt/images/img0",
-            "backing-filename": "/var/lib/libvirt/images/img0",
-            "dirty-flag": false
-          },
-          "backing-filename-format": "qcow2",
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/img2",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "full-backing-filename": "/var/lib/libvirt/images/img1",
-          "backing-filename": "/var/lib/libvirt/images/img1",
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/img3",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/img2",
-        "backing-filename": "/var/lib/libvirt/images/img2",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block118",
-      "backing_file_depth": 3,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/img2",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img3",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/img3",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block092",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img3",
-      "encryption_key_missing": false
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result
deleted file mode 100644
index 5288319d30..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result
+++ /dev/null
@@ -1,33 +0,0 @@
-drive-ide0-0-0
-filename    : '/var/lib/libvirt/images/img3'
-format node : '#block118'
-format drv  : 'qcow2'
-storage node: '#block092'
-storage drv : 'file'
-  filename    : '/var/lib/libvirt/images/img2'
-  format node : '#block346'
-  format drv  : 'qcow2'
-  storage node: '#block232'
-  storage drv : 'file'
-    filename    : '/var/lib/libvirt/images/img1'
-    format node : '#block548'
-    format drv  : 'qcow2'
-    storage node: '#block442'
-    storage drv : 'file'
-      filename    : '/var/lib/libvirt/images/img0'
-      format node : '#block797'
-      format drv  : 'qcow2'
-      storage node: '#block614'
-      storage drv : 'file'
-
-drive-ide0-0-1
-filename    : '/var/lib/libvirt/images/relsnap.qcow2'
-format node : '#block1290'
-format drv  : 'qcow2'
-storage node: '#block1107'
-storage drv : 'file'
-  filename    : '/var/lib/libvirt/images/base.qcow2'
-  format node : '#block927'
-  format drv  : 'qcow2'
-  storage node: '#block800'
-  storage drv : 'file'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-blockstats.json
deleted file mode 100644
index 7fd2383013..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-blockstats.json
+++ /dev/null
@@ -1,221 +0,0 @@
-[
-    {
-      "device": "drive-sata0-0-0",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block020"
-      },
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 290083,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 512,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "idle_time_ns": 74812730779,
-        "rd_operations": 1,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "backing": {
-        "parent": {
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "node-name": "#block224"
-        },
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block320"
-      },
-      "node-name": "#block132"
-    },
-    {
-      "device": "drive-sata0-0-1",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block487"
-      },
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 0,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 0,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "rd_operations": 0,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "backing": {
-        "parent": {
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "node-name": "#block692"
-        },
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block771"
-      },
-      "node-name": "#block548"
-    }
-  ]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-named-nodes.json
deleted file mode 100644
index 3945ff5ed8..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-named-nodes.json
+++ /dev/null
@@ -1,316 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/base.qcow2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block771",
-      "backing_file_depth": 0,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/base.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block692",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/base.qcow2",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/b.qcow2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block548",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/base.qcow2",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/b.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/b.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block487",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/b.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/base.qcow2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block320",
-      "backing_file_depth": 0,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/base.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block224",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/base.qcow2",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/a.qcow2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block132",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/base.qcow2",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/a.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/a.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block020",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/a.qcow2",
-      "encryption_key_missing": false
-    }
-  ]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result
deleted file mode 100644
index 7b12a1746a..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result
+++ /dev/null
@@ -1,23 +0,0 @@
-drive-sata0-0-0
-filename    : '/var/lib/libvirt/images/a.qcow2'
-format node : '#block132'
-format drv  : 'qcow2'
-storage node: '#block020'
-storage drv : 'file'
-  filename    : '/var/lib/libvirt/images/base.qcow2'
-  format node : '#block320'
-  format drv  : 'qcow2'
-  storage node: '#block224'
-  storage drv : 'file'
-
-drive-sata0-0-1
-filename    : '/var/lib/libvirt/images/b.qcow2'
-format node : '#block548'
-format drv  : 'qcow2'
-storage node: '#block487'
-storage drv : 'file'
-  filename    : '/var/lib/libvirt/images/base.qcow2'
-  format node : '#block771'
-  format drv  : 'qcow2'
-  storage node: '#block692'
-  storage drv : 'file'
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index adfe6e1c55..0bff1ed4d0 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -2474,80 +2474,6 @@ testQemuMonitorCPUInfo(const void *opaque)
 }


-static int
-testBlockNodeNameDetectFormat(void *payload,
-                              const char *name,
-                              void *opaque)
-{
-    qemuBlockNodeNameBackingChainData *entry = payload;
-    const char *diskalias = name;
-    virBuffer *buf = opaque;
-
-    virBufferSetIndent(buf, 0);
-
-    virBufferAdd(buf, diskalias, -1);
-    virBufferAddLit(buf, "\n");
-
-    while (entry) {
-        virBufferAsprintf(buf, "filename    : '%s'\n", entry->qemufilename);
-        virBufferAsprintf(buf, "format node : '%s'\n",
-                          NULLSTR(entry->nodeformat));
-        virBufferAsprintf(buf, "format drv  : '%s'\n", NULLSTR(entry->drvformat));
-        virBufferAsprintf(buf, "storage node: '%s'\n",
-                          NULLSTR(entry->nodestorage));
-        virBufferAsprintf(buf, "storage drv : '%s'\n", NULLSTR(entry->drvstorage));
-
-        virBufferAdjustIndent(buf, 2);
-
-        entry = entry->backing;
-    }
-
-    virBufferSetIndent(buf, 0);
-    virBufferAddLit(buf, "\n");
-    return 0;
-}
-
-
-static int
-testBlockNodeNameDetect(const void *opaque)
-{
-    const char *testname = opaque;
-    const char *pathprefix = "qemumonitorjsondata/qemumonitorjson-nodename-";
-    g_autofree char *resultFile = NULL;
-    g_autofree char *actual = NULL;
-    g_autoptr(virJSONValue) namedNodesJson = NULL;
-    g_autoptr(virJSONValue) blockstatsJson = NULL;
-    g_autoptr(GHashTable) nodedata = NULL;
-    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-
-    resultFile = g_strdup_printf("%s/%s%s.result", abs_srcdir, pathprefix,
-                                 testname);
-
-    if (!(namedNodesJson = virTestLoadFileJSON(pathprefix, testname,
-                                               "-named-nodes.json", NULL)))
-        return -1;
-
-    if (!(blockstatsJson = virTestLoadFileJSON(pathprefix, testname,
-                                               "-blockstats.json", NULL)))
-        return -1;
-
-    if (!(nodedata = qemuBlockNodeNameGetBackingChain(namedNodesJson,
-                                                      blockstatsJson)))
-        return -1;
-
-    virHashForEachSorted(nodedata, testBlockNodeNameDetectFormat, &buf);
-
-    virBufferTrim(&buf, "\n");
-
-    actual = virBufferContentAndReset(&buf);
-
-    if (virTestCompareToFile(actual, resultFile) < 0)
-        return -1;
-
-    return 0;
-}
-
-
 struct testQAPISchemaData {
     GHashTable *schema;
     const char *name;
@@ -3127,24 +3053,6 @@ mymain(void)

     DO_TEST_CPU_INFO_FAST("s390-fast", 2);

-#define DO_TEST_BLOCK_NODE_DETECT(testname) \
-    do { \
-        if (virTestRun("node-name-detect(" testname ")", \
-                       testBlockNodeNameDetect, testname) < 0) \
-            ret = -1; \
-    } while (0)
-
-    DO_TEST_BLOCK_NODE_DETECT("basic");
-    DO_TEST_BLOCK_NODE_DETECT("same-backing");
-    DO_TEST_BLOCK_NODE_DETECT("relative");
-    DO_TEST_BLOCK_NODE_DETECT("gluster");
-    DO_TEST_BLOCK_NODE_DETECT("blockjob");
-    DO_TEST_BLOCK_NODE_DETECT("luks");
-    DO_TEST_BLOCK_NODE_DETECT("iscsi");
-    DO_TEST_BLOCK_NODE_DETECT("old");
-    DO_TEST_BLOCK_NODE_DETECT("empty");
-
-#undef DO_TEST_BLOCK_NODE_DETECT

 #define DO_TEST_QAPI_QUERY(nme, qry, scc, rplobj) \
     do { \
-- 
2.36.1




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux