Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt
提交 b8240fe7 编写于 作者: P Peter Krempa
浏览文件
操作

qemu: block: Don't nest storage layer properties into format layer 

Reference the storage via node name rather than inlining it. This is
the approach that will be used with -blockdev/blockdev-add since it
allows more control and is more future proof.
Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJohn Ferlan <jferlan@redhat.com>
上级 cf9683ca
隐藏空白更改
内联 并排
Showing with 834 addition and 759 deletion
src/qemu/qemu_block.c
浏览文件 @ b8240fe7
...@@ -1432,7 +1432,6 @@ virJSONValuePtr ...@@ -1432,7 +1432,6 @@ virJSONValuePtr
qemuBlockStorageSourceGetBlockdevProps(virStorageSourcePtr src) qemuBlockStorageSourceGetBlockdevProps(virStorageSourcePtr src)
{ {
bool backingSupported = src->format >= VIR_STORAGE_FILE_BACKING; bool backingSupported = src->format >= VIR_STORAGE_FILE_BACKING;
virJSONValuePtr storage = NULL;
virJSONValuePtr props = NULL; virJSONValuePtr props = NULL;
virJSONValuePtr ret = NULL; virJSONValuePtr ret = NULL;
...@@ -1446,13 +1445,9 @@ qemuBlockStorageSourceGetBlockdevProps(virStorageSourcePtr src) ...@@ -1446,13 +1445,9 @@ qemuBlockStorageSourceGetBlockdevProps(virStorageSourcePtr src)
if (!(props = qemuBlockStorageSourceGetBlockdevFormatProps(src))) if (!(props = qemuBlockStorageSourceGetBlockdevFormatProps(src)))
goto cleanup; goto cleanup;
if (!(storage = qemuBlockStorageSourceGetBackendProps(src, false))) if (virJSONValueObjectAppendString(props, "file", src->nodestorage) < 0)
goto cleanup; goto cleanup;
if (virJSONValueObjectAppend(props, "file", storage) < 0)
goto cleanup;
storage = NULL;
if (src->backingStore && backingSupported) { if (src->backingStore && backingSupported) {
if (virStorageSourceHasBacking(src)) { if (virStorageSourceHasBacking(src)) {
if (virJSONValueObjectAppendString(props, "backing", if (virJSONValueObjectAppendString(props, "backing",
...@@ -1469,7 +1464,6 @@ qemuBlockStorageSourceGetBlockdevProps(virStorageSourcePtr src) ...@@ -1469,7 +1464,6 @@ qemuBlockStorageSourceGetBlockdevProps(virStorageSourcePtr src)
VIR_STEAL_PTR(ret, props); VIR_STEAL_PTR(ret, props);
cleanup: cleanup:
virJSONValueFree(storage);
virJSONValueFree(props); virJSONValueFree(props);
return ret; return ret;
} }
tests/qemublocktest.c
浏览文件 @ b8240fe7
...@@ -191,7 +191,8 @@ testQemuDiskXMLToProps(const void *opaque) ...@@ -191,7 +191,8 @@ testQemuDiskXMLToProps(const void *opaque)
struct testQemuDiskXMLToJSONData *data = (void *) opaque; struct testQemuDiskXMLToJSONData *data = (void *) opaque;
virDomainDiskDefPtr disk = NULL; virDomainDiskDefPtr disk = NULL;
virStorageSourcePtr n; virStorageSourcePtr n;
virJSONValuePtr props = NULL; virJSONValuePtr formatProps = NULL;
virJSONValuePtr storageProps = NULL;
char *xmlpath = NULL; char *xmlpath = NULL;
char *xmlstr = NULL; char *xmlstr = NULL;
int ret = -1; int ret = -1;
...@@ -221,7 +222,8 @@ testQemuDiskXMLToProps(const void *opaque) ...@@ -221,7 +222,8 @@ testQemuDiskXMLToProps(const void *opaque)
if (testQemuDiskXMLToJSONFakeSecrets(n) < 0) if (testQemuDiskXMLToJSONFakeSecrets(n) < 0)
goto cleanup; goto cleanup;
if (!(props = qemuBlockStorageSourceGetBlockdevProps(n))) { if (!(formatProps = qemuBlockStorageSourceGetBlockdevProps(n)) ||
!(storageProps = qemuBlockStorageSourceGetBackendProps(n, false))) {
if (!data->fail) { if (!data->fail) {
VIR_TEST_VERBOSE("failed to generate qemu blockdev props\n"); VIR_TEST_VERBOSE("failed to generate qemu blockdev props\n");
goto cleanup; goto cleanup;
...@@ -231,13 +233,16 @@ testQemuDiskXMLToProps(const void *opaque) ...@@ -231,13 +233,16 @@ testQemuDiskXMLToProps(const void *opaque)
goto cleanup; goto cleanup;
} }
if (VIR_APPEND_ELEMENT(data->props, data->nprops, props) < 0) if (VIR_APPEND_ELEMENT(data->props, data->nprops, formatProps) < 0 ||
VIR_APPEND_ELEMENT(data->props, data->nprops, storageProps) < 0)
goto cleanup; goto cleanup;
} }
ret = 0; ret = 0;
cleanup: cleanup:
virJSONValueFree(formatProps);
virJSONValueFree(storageProps);
virDomainDiskDefFree(disk); virDomainDiskDefFree(disk);
VIR_FREE(xmlpath); VIR_FREE(xmlpath);
VIR_FREE(xmlstr); VIR_FREE(xmlstr);
......
tests/qemublocktestdata/xml2json/block-raw-noopts.json
浏览文件 @ b8240fe7
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
"node-name": "0123456789ABCDEF0123456789ABCDE", "node-name": "0123456789ABCDEF0123456789ABCDE",
"read-only": false, "read-only": false,
"driver": "raw", "driver": "raw",
"file": { "file": "0123456789ABCDEF0123456789ABCDE"
"driver": "host_device", }
"filename": "/dev/blah", {
"node-name": "0123456789ABCDEF0123456789ABCDE", "driver": "host_device",
"read-only": false, "filename": "/dev/blah",
"discard": "unmap" "node-name": "0123456789ABCDEF0123456789ABCDE",
} "read-only": false,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/dir-fat-cache.json
浏览文件 @ b8240fe7
...@@ -6,17 +6,18 @@ ...@@ -6,17 +6,18 @@
"no-flush": false "no-flush": false
}, },
"driver": "raw", "driver": "raw",
"file": { "file": "node-s"
"driver": "vvfat", }
"dir": "/var/somefiles", {
"floppy": false, "driver": "vvfat",
"rw": false, "dir": "/var/somefiles",
"node-name": "node-s", "floppy": false,
"cache": { "rw": false,
"direct": true, "node-name": "node-s",
"no-flush": false "cache": {
}, "direct": true,
"read-only": true, "no-flush": false
"discard": "unmap" },
} "read-only": true,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/dir-fat-floppy.json
浏览文件 @ b8240fe7
...@@ -2,13 +2,14 @@ ...@@ -2,13 +2,14 @@
"node-name": "node-f", "node-name": "node-f",
"read-only": true, "read-only": true,
"driver": "raw", "driver": "raw",
"file": { "file": "node-s"
"driver": "vvfat", }
"dir": "/var/somefiles", {
"floppy": true, "driver": "vvfat",
"rw": false, "dir": "/var/somefiles",
"node-name": "node-s", "floppy": true,
"read-only": true, "rw": false,
"discard": "unmap" "node-name": "node-s",
} "read-only": true,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/dir-fat-readonly.json
浏览文件 @ b8240fe7
...@@ -2,13 +2,14 @@ ...@@ -2,13 +2,14 @@
"node-name": "node-f", "node-name": "node-f",
"read-only": true, "read-only": true,
"driver": "raw", "driver": "raw",
"file": { "file": "node-s"
"driver": "vvfat", }
"dir": "/var/somefiles", {
"floppy": false, "driver": "vvfat",
"rw": false, "dir": "/var/somefiles",
"node-name": "node-s", "floppy": false,
"read-only": true, "rw": false,
"discard": "unmap" "node-name": "node-s",
} "read-only": true,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json
浏览文件 @ b8240fe7
...@@ -2,61 +2,65 @@ ...@@ -2,61 +2,65 @@
"node-name": "node-a-f", "node-name": "node-a-f",
"read-only": false, "read-only": false,
"driver": "qcow", "driver": "qcow",
"file": { "file": "node-a-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"aio": "threads",
"node-name": "node-a-s",
"read-only": false,
"discard": "unmap"
},
"backing": "node-b-f" "backing": "node-b-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"aio": "threads",
"node-name": "node-a-s",
"read-only": false,
"discard": "unmap"
}
{ {
"node-name": "node-b-f", "node-name": "node-b-f",
"read-only": true, "read-only": true,
"driver": "qed", "driver": "qed",
"file": { "file": "node-b-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"aio": "threads",
"node-name": "node-b-s",
"read-only": true,
"discard": "unmap"
},
"backing": "node-c-f" "backing": "node-c-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"aio": "threads",
"node-name": "node-b-s",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-c-f", "node-name": "node-c-f",
"read-only": true, "read-only": true,
"driver": "vmdk", "driver": "vmdk",
"file": { "file": "node-c-s",
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"read-only": true,
"discard": "unmap"
},
"backing": "node-d-f" "backing": "node-d-f"
} }
{
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-d-f", "node-name": "node-d-f",
"read-only": true, "read-only": true,
"driver": "raw", "driver": "raw",
"file": { "file": "node-d-s"
"driver": "file", }
"filename": "/var/lib/libvirt/images/d", {
"aio": "threads", "driver": "file",
"node-name": "node-d-s", "filename": "/var/lib/libvirt/images/d",
"read-only": true, "aio": "threads",
"discard": "unmap" "node-name": "node-d-s",
} "read-only": true,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.json
浏览文件 @ b8240fe7
...@@ -6,19 +6,20 @@ ...@@ -6,19 +6,20 @@
"no-flush": false "no-flush": false
}, },
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "node-a-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"cache": {
"direct": true,
"no-flush": false
},
"read-only": false,
"discard": "unmap"
},
"backing": "node-b-f" "backing": "node-b-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"cache": {
"direct": true,
"no-flush": false
},
"read-only": false,
"discard": "unmap"
}
{ {
"node-name": "node-b-f", "node-name": "node-b-f",
"read-only": true, "read-only": true,
...@@ -27,19 +28,20 @@ ...@@ -27,19 +28,20 @@
"no-flush": false "no-flush": false
}, },
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "node-b-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"cache": {
"direct": true,
"no-flush": false
},
"read-only": true,
"discard": "unmap"
},
"backing": "node-c-f" "backing": "node-c-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"cache": {
"direct": true,
"no-flush": false
},
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-c-f", "node-name": "node-c-f",
"read-only": true, "read-only": true,
...@@ -48,27 +50,28 @@ ...@@ -48,27 +50,28 @@
"no-flush": false "no-flush": false
}, },
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "node-c-s",
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"cache": {
"direct": true,
"no-flush": false
},
"read-only": true,
"discard": "unmap"
},
"backing": "node-d-f" "backing": "node-d-f"
} }
{
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"cache": {
"direct": true,
"no-flush": false
},
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-d-f", "node-name": "node-d-f",
"read-only": true, "read-only": true,
...@@ -77,15 +80,16 @@ ...@@ -77,15 +80,16 @@
"no-flush": false "no-flush": false
}, },
"driver": "raw", "driver": "raw",
"file": { "file": "node-d-s"
"driver": "file", }
"filename": "/var/lib/libvirt/images/d", {
"node-name": "node-d-s", "driver": "file",
"cache": { "filename": "/var/lib/libvirt/images/d",
"direct": true, "node-name": "node-d-s",
"no-flush": false "cache": {
}, "direct": true,
"read-only": true, "no-flush": false
"discard": "unmap" },
} "read-only": true,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json
浏览文件 @ b8240fe7
...@@ -6,19 +6,20 @@ ...@@ -6,19 +6,20 @@
"no-flush": false "no-flush": false
}, },
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "node-a-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"cache": {
"direct": true,
"no-flush": false
},
"read-only": false,
"discard": "unmap"
},
"backing": "node-b-f" "backing": "node-b-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"cache": {
"direct": true,
"no-flush": false
},
"read-only": false,
"discard": "unmap"
}
{ {
"node-name": "node-b-f", "node-name": "node-b-f",
"read-only": true, "read-only": true,
...@@ -27,19 +28,20 @@ ...@@ -27,19 +28,20 @@
"no-flush": false "no-flush": false
}, },
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "node-b-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"cache": {
"direct": true,
"no-flush": false
},
"read-only": true,
"discard": "unmap"
},
"backing": "node-c-f" "backing": "node-c-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"cache": {
"direct": true,
"no-flush": false
},
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-c-f", "node-name": "node-c-f",
"read-only": true, "read-only": true,
...@@ -48,27 +50,28 @@ ...@@ -48,27 +50,28 @@
"no-flush": false "no-flush": false
}, },
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "node-c-s",
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"cache": {
"direct": true,
"no-flush": false
},
"read-only": true,
"discard": "unmap"
},
"backing": "node-d-f" "backing": "node-d-f"
} }
{
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"cache": {
"direct": true,
"no-flush": false
},
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-d-f", "node-name": "node-d-f",
"read-only": true, "read-only": true,
...@@ -77,15 +80,16 @@ ...@@ -77,15 +80,16 @@
"no-flush": false "no-flush": false
}, },
"driver": "raw", "driver": "raw",
"file": { "file": "node-d-s"
"driver": "file", }
"filename": "/var/lib/libvirt/images/d", {
"node-name": "node-d-s", "driver": "file",
"cache": { "filename": "/var/lib/libvirt/images/d",
"direct": true, "node-name": "node-d-s",
"no-flush": false "cache": {
}, "direct": true,
"read-only": true, "no-flush": false
"discard": "unmap" },
} "read-only": true,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json
浏览文件 @ b8240fe7
...@@ -6,19 +6,20 @@ ...@@ -6,19 +6,20 @@
"no-flush": true "no-flush": true
}, },
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "node-a-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"cache": {
"direct": false,
"no-flush": true
},
"read-only": false,
"discard": "unmap"
},
"backing": "node-b-f" "backing": "node-b-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"cache": {
"direct": false,
"no-flush": true
},
"read-only": false,
"discard": "unmap"
}
{ {
"node-name": "node-b-f", "node-name": "node-b-f",
"read-only": true, "read-only": true,
...@@ -27,19 +28,20 @@ ...@@ -27,19 +28,20 @@
"no-flush": true "no-flush": true
}, },
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "node-b-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"cache": {
"direct": false,
"no-flush": true
},
"read-only": true,
"discard": "unmap"
},
"backing": "node-c-f" "backing": "node-c-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"cache": {
"direct": false,
"no-flush": true
},
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-c-f", "node-name": "node-c-f",
"read-only": true, "read-only": true,
...@@ -48,27 +50,28 @@ ...@@ -48,27 +50,28 @@
"no-flush": true "no-flush": true
}, },
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "node-c-s",
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"cache": {
"direct": false,
"no-flush": true
},
"read-only": true,
"discard": "unmap"
},
"backing": "node-d-f" "backing": "node-d-f"
} }
{
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"cache": {
"direct": false,
"no-flush": true
},
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-d-f", "node-name": "node-d-f",
"read-only": true, "read-only": true,
...@@ -77,15 +80,16 @@ ...@@ -77,15 +80,16 @@
"no-flush": true "no-flush": true
}, },
"driver": "raw", "driver": "raw",
"file": { "file": "node-d-s"
"driver": "file", }
"filename": "/var/lib/libvirt/images/d", {
"node-name": "node-d-s", "driver": "file",
"cache": { "filename": "/var/lib/libvirt/images/d",
"direct": false, "node-name": "node-d-s",
"no-flush": true "cache": {
}, "direct": false,
"read-only": true, "no-flush": true
"discard": "unmap" },
} "read-only": true,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json
浏览文件 @ b8240fe7
...@@ -6,19 +6,20 @@ ...@@ -6,19 +6,20 @@
"no-flush": false "no-flush": false
}, },
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "node-a-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"cache": {
"direct": false,
"no-flush": false
},
"read-only": false,
"discard": "unmap"
},
"backing": "node-b-f" "backing": "node-b-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"cache": {
"direct": false,
"no-flush": false
},
"read-only": false,
"discard": "unmap"
}
{ {
"node-name": "node-b-f", "node-name": "node-b-f",
"read-only": true, "read-only": true,
...@@ -27,19 +28,20 @@ ...@@ -27,19 +28,20 @@
"no-flush": false "no-flush": false
}, },
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "node-b-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"cache": {
"direct": false,
"no-flush": false
},
"read-only": true,
"discard": "unmap"
},
"backing": "node-c-f" "backing": "node-c-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"cache": {
"direct": false,
"no-flush": false
},
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-c-f", "node-name": "node-c-f",
"read-only": true, "read-only": true,
...@@ -48,27 +50,28 @@ ...@@ -48,27 +50,28 @@
"no-flush": false "no-flush": false
}, },
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "node-c-s",
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"cache": {
"direct": false,
"no-flush": false
},
"read-only": true,
"discard": "unmap"
},
"backing": "node-d-f" "backing": "node-d-f"
} }
{
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"cache": {
"direct": false,
"no-flush": false
},
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-d-f", "node-name": "node-d-f",
"read-only": true, "read-only": true,
...@@ -77,15 +80,16 @@ ...@@ -77,15 +80,16 @@
"no-flush": false "no-flush": false
}, },
"driver": "raw", "driver": "raw",
"file": { "file": "node-d-s"
"driver": "file", }
"filename": "/var/lib/libvirt/images/d", {
"node-name": "node-d-s", "driver": "file",
"cache": { "filename": "/var/lib/libvirt/images/d",
"direct": false, "node-name": "node-d-s",
"no-flush": false "cache": {
}, "direct": false,
"read-only": true, "no-flush": false
"discard": "unmap" },
} "read-only": true,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json
浏览文件 @ b8240fe7
...@@ -6,19 +6,20 @@ ...@@ -6,19 +6,20 @@
"no-flush": false "no-flush": false
}, },
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "node-a-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"cache": {
"direct": false,
"no-flush": false
},
"read-only": false,
"discard": "unmap"
},
"backing": "node-b-f" "backing": "node-b-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"cache": {
"direct": false,
"no-flush": false
},
"read-only": false,
"discard": "unmap"
}
{ {
"node-name": "node-b-f", "node-name": "node-b-f",
"read-only": true, "read-only": true,
...@@ -27,19 +28,20 @@ ...@@ -27,19 +28,20 @@
"no-flush": false "no-flush": false
}, },
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "node-b-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"cache": {
"direct": false,
"no-flush": false
},
"read-only": true,
"discard": "unmap"
},
"backing": "node-c-f" "backing": "node-c-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"cache": {
"direct": false,
"no-flush": false
},
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-c-f", "node-name": "node-c-f",
"read-only": true, "read-only": true,
...@@ -48,27 +50,28 @@ ...@@ -48,27 +50,28 @@
"no-flush": false "no-flush": false
}, },
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "node-c-s",
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"cache": {
"direct": false,
"no-flush": false
},
"read-only": true,
"discard": "unmap"
},
"backing": "node-d-f" "backing": "node-d-f"
} }
{
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"cache": {
"direct": false,
"no-flush": false
},
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-d-f", "node-name": "node-d-f",
"read-only": true, "read-only": true,
...@@ -77,15 +80,16 @@ ...@@ -77,15 +80,16 @@
"no-flush": false "no-flush": false
}, },
"driver": "raw", "driver": "raw",
"file": { "file": "node-d-s"
"driver": "file", }
"filename": "/var/lib/libvirt/images/d", {
"node-name": "node-d-s", "driver": "file",
"cache": { "filename": "/var/lib/libvirt/images/d",
"direct": false, "node-name": "node-d-s",
"no-flush": false "cache": {
}, "direct": false,
"read-only": true, "no-flush": false
"discard": "unmap" },
} "read-only": true,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-backing_basic-detect.json
浏览文件 @ b8240fe7
...@@ -3,58 +3,62 @@ ...@@ -3,58 +3,62 @@
"read-only": false, "read-only": false,
"detect-zeroes": "on", "detect-zeroes": "on",
"driver": "qcow", "driver": "qcow",
"file": { "file": "node-a-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"read-only": false,
"discard": "unmap"
},
"backing": "node-b-f" "backing": "node-b-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"read-only": false,
"discard": "unmap"
}
{ {
"node-name": "node-b-f", "node-name": "node-b-f",
"read-only": true, "read-only": true,
"driver": "qed", "driver": "qed",
"file": { "file": "node-b-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"read-only": true,
"discard": "unmap"
},
"backing": "node-c-f" "backing": "node-c-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-c-f", "node-name": "node-c-f",
"read-only": true, "read-only": true,
"driver": "vmdk", "driver": "vmdk",
"file": { "file": "node-c-s",
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"read-only": true,
"discard": "unmap"
},
"backing": "node-d-f" "backing": "node-d-f"
} }
{
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-d-f", "node-name": "node-d-f",
"read-only": true, "read-only": true,
"driver": "raw", "driver": "raw",
"file": { "file": "node-d-s"
"driver": "file", }
"filename": "/var/lib/libvirt/images/d", {
"node-name": "node-d-s", "driver": "file",
"read-only": true, "filename": "/var/lib/libvirt/images/d",
"discard": "unmap" "node-name": "node-d-s",
} "read-only": true,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-backing_basic-noopts.json
浏览文件 @ b8240fe7
...@@ -2,50 +2,54 @@ ...@@ -2,50 +2,54 @@
"node-name": "node-a-f", "node-name": "node-a-f",
"read-only": false, "read-only": false,
"driver": "qed", "driver": "qed",
"file": { "file": "node-a-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"read-only": false,
"discard": "unmap"
},
"backing": "node-b-f" "backing": "node-b-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"read-only": false,
"discard": "unmap"
}
{ {
"node-name": "node-b-f", "node-name": "node-b-f",
"read-only": true, "read-only": true,
"driver": "qcow", "driver": "qcow",
"file": { "file": "node-b-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"read-only": true,
"discard": "unmap"
},
"backing": "node-c-f" "backing": "node-c-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-c-f", "node-name": "node-c-f",
"read-only": true, "read-only": true,
"driver": "vmdk", "driver": "vmdk",
"file": { "file": "node-c-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/c",
"node-name": "node-c-s",
"read-only": true,
"discard": "unmap"
},
"backing": "node-d-f" "backing": "node-d-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/c",
"node-name": "node-c-s",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-d-f", "node-name": "node-d-f",
"read-only": true, "read-only": true,
"driver": "raw", "driver": "raw",
"file": { "file": "node-d-s"
"driver": "file", }
"filename": "/var/lib/libvirt/images/d", {
"node-name": "node-d-s", "driver": "file",
"read-only": true, "filename": "/var/lib/libvirt/images/d",
"discard": "unmap" "node-name": "node-d-s",
} "read-only": true,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json
浏览文件 @ b8240fe7
...@@ -4,61 +4,65 @@ ...@@ -4,61 +4,65 @@
"discard": "unmap", "discard": "unmap",
"detect-zeroes": "unmap", "detect-zeroes": "unmap",
"driver": "qcow", "driver": "qcow",
"file": { "file": "node-a-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"read-only": false,
"discard": "unmap"
},
"backing": "node-b-f" "backing": "node-b-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"read-only": false,
"discard": "unmap"
}
{ {
"node-name": "node-b-f", "node-name": "node-b-f",
"read-only": true, "read-only": true,
"discard": "unmap", "discard": "unmap",
"driver": "qed", "driver": "qed",
"file": { "file": "node-b-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"read-only": true,
"discard": "unmap"
},
"backing": "node-c-f" "backing": "node-c-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-c-f", "node-name": "node-c-f",
"read-only": true, "read-only": true,
"discard": "unmap", "discard": "unmap",
"driver": "vmdk", "driver": "vmdk",
"file": { "file": "node-c-s",
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"read-only": true,
"discard": "unmap"
},
"backing": "node-d-f" "backing": "node-d-f"
} }
{
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-d-f", "node-name": "node-d-f",
"read-only": true, "read-only": true,
"discard": "unmap", "discard": "unmap",
"driver": "raw", "driver": "raw",
"file": { "file": "node-d-s"
"driver": "file", }
"filename": "/var/lib/libvirt/images/d", {
"node-name": "node-d-s", "driver": "file",
"read-only": true, "filename": "/var/lib/libvirt/images/d",
"discard": "unmap" "node-name": "node-d-s",
} "read-only": true,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json
浏览文件 @ b8240fe7
...@@ -4,61 +4,65 @@ ...@@ -4,61 +4,65 @@
"discard": "ignore", "discard": "ignore",
"detect-zeroes": "on", "detect-zeroes": "on",
"driver": "qcow", "driver": "qcow",
"file": { "file": "node-a-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"read-only": false,
"discard": "unmap"
},
"backing": "node-b-f" "backing": "node-b-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"read-only": false,
"discard": "unmap"
}
{ {
"node-name": "node-b-f", "node-name": "node-b-f",
"read-only": true, "read-only": true,
"discard": "ignore", "discard": "ignore",
"driver": "qed", "driver": "qed",
"file": { "file": "node-b-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"read-only": true,
"discard": "unmap"
},
"backing": "node-c-f" "backing": "node-c-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-c-f", "node-name": "node-c-f",
"read-only": true, "read-only": true,
"discard": "ignore", "discard": "ignore",
"driver": "vmdk", "driver": "vmdk",
"file": { "file": "node-c-s",
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"read-only": true,
"discard": "unmap"
},
"backing": "node-d-f" "backing": "node-d-f"
} }
{
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-d-f", "node-name": "node-d-f",
"read-only": true, "read-only": true,
"discard": "ignore", "discard": "ignore",
"driver": "raw", "driver": "raw",
"file": { "file": "node-d-s"
"driver": "file", }
"filename": "/var/lib/libvirt/images/d", {
"node-name": "node-d-s", "driver": "file",
"read-only": true, "filename": "/var/lib/libvirt/images/d",
"discard": "unmap" "node-name": "node-d-s",
} "read-only": true,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json
浏览文件 @ b8240fe7
...@@ -3,61 +3,65 @@ ...@@ -3,61 +3,65 @@
"read-only": false, "read-only": false,
"discard": "unmap", "discard": "unmap",
"driver": "qcow", "driver": "qcow",
"file": { "file": "node-a-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"read-only": false,
"discard": "unmap"
},
"backing": "node-b-f" "backing": "node-b-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"read-only": false,
"discard": "unmap"
}
{ {
"node-name": "node-b-f", "node-name": "node-b-f",
"read-only": true, "read-only": true,
"discard": "unmap", "discard": "unmap",
"driver": "qed", "driver": "qed",
"file": { "file": "node-b-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"read-only": true,
"discard": "unmap"
},
"backing": "node-c-f" "backing": "node-c-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-c-f", "node-name": "node-c-f",
"read-only": true, "read-only": true,
"discard": "unmap", "discard": "unmap",
"driver": "vmdk", "driver": "vmdk",
"file": { "file": "node-c-s",
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"read-only": true,
"discard": "unmap"
},
"backing": "node-d-f" "backing": "node-d-f"
} }
{
"driver": "gluster",
"volume": "images",
"path": "c",
"server": [
{
"type": "inet",
"host": "test.org",
"port": "24007"
}
],
"node-name": "node-c-s",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "node-d-f", "node-name": "node-d-f",
"read-only": true, "read-only": true,
"discard": "unmap", "discard": "unmap",
"driver": "raw", "driver": "raw",
"file": { "file": "node-d-s"
"driver": "file", }
"filename": "/var/lib/libvirt/images/d", {
"node-name": "node-d-s", "driver": "file",
"read-only": true, "filename": "/var/lib/libvirt/images/d",
"discard": "unmap" "node-name": "node-d-s",
} "read-only": true,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-bochs-noopts.json
浏览文件 @ b8240fe7
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
"node-name": "test1", "node-name": "test1",
"read-only": false, "read-only": false,
"driver": "bochs", "driver": "bochs",
"file": { "file": "test2"
"driver": "file", }
"filename": "/path/to/i.img", {
"node-name": "test2", "driver": "file",
"read-only": false, "filename": "/path/to/i.img",
"discard": "unmap" "node-name": "test2",
} "read-only": false,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-cloop-noopts.json
浏览文件 @ b8240fe7
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
"node-name": "test1", "node-name": "test1",
"read-only": false, "read-only": false,
"driver": "cloop", "driver": "cloop",
"file": { "file": "test2"
"driver": "file", }
"filename": "/path/to/i.img", {
"node-name": "test2", "driver": "file",
"read-only": false, "filename": "/path/to/i.img",
"discard": "unmap" "node-name": "test2",
} "read-only": false,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-dmg-noopts.json
浏览文件 @ b8240fe7
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
"node-name": "test1", "node-name": "test1",
"read-only": false, "read-only": false,
"driver": "dmg", "driver": "dmg",
"file": { "file": "test2"
"driver": "file", }
"filename": "/path/to/i.img", {
"node-name": "test2", "driver": "file",
"read-only": false, "filename": "/path/to/i.img",
"discard": "unmap" "node-name": "test2",
} "read-only": false,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-ploop-noopts.json
浏览文件 @ b8240fe7
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
"node-name": "test1", "node-name": "test1",
"read-only": false, "read-only": false,
"driver": "parallels", "driver": "parallels",
"file": { "file": "test2"
"driver": "file", }
"filename": "/path/to/i.img", {
"node-name": "test2", "driver": "file",
"read-only": false, "filename": "/path/to/i.img",
"discard": "unmap" "node-name": "test2",
} "read-only": false,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.json
浏览文件 @ b8240fe7
...@@ -6,15 +6,16 @@ ...@@ -6,15 +6,16 @@
"format": "luks", "format": "luks",
"key-secret": "node-b-f-encalias" "key-secret": "node-b-f-encalias"
}, },
"file": { "file": "node-a-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"read-only": false,
"discard": "unmap"
},
"backing": "node-b-f" "backing": "node-b-f"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/a",
"node-name": "node-a-s",
"read-only": false,
"discard": "unmap"
}
{ {
"node-name": "node-b-f", "node-name": "node-b-f",
"read-only": true, "read-only": true,
...@@ -23,12 +24,13 @@ ...@@ -23,12 +24,13 @@
"format": "aes", "format": "aes",
"key-secret": "node-b-f-encalias" "key-secret": "node-b-f-encalias"
}, },
"file": { "file": "node-b-s",
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"read-only": true,
"discard": "unmap"
},
"backing": null "backing": null
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/b",
"node-name": "node-b-s",
"read-only": true,
"discard": "unmap"
}
tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts.json
浏览文件 @ b8240fe7
...@@ -2,129 +2,139 @@ ...@@ -2,129 +2,139 @@
"node-name": "#block126", "node-name": "#block126",
"read-only": false, "read-only": false,
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "#block004",
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1507297895",
"node-name": "#block004",
"read-only": false,
"discard": "unmap"
},
"backing": "#block313" "backing": "#block313"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1507297895",
"node-name": "#block004",
"read-only": false,
"discard": "unmap"
}
{ {
"node-name": "#block313", "node-name": "#block313",
"read-only": true, "read-only": true,
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "#block256",
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1484071872",
"node-name": "#block256",
"read-only": true,
"discard": "unmap"
},
"backing": "#block556" "backing": "#block556"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1484071872",
"node-name": "#block256",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "#block556", "node-name": "#block556",
"read-only": true, "read-only": true,
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "#block418",
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1483615252",
"node-name": "#block418",
"read-only": true,
"discard": "unmap"
},
"backing": "#block767" "backing": "#block767"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1483615252",
"node-name": "#block418",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "#block767", "node-name": "#block767",
"read-only": true, "read-only": true,
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "#block624",
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1483605924",
"node-name": "#block624",
"read-only": true,
"discard": "unmap"
},
"backing": "#block937" "backing": "#block937"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1483605924",
"node-name": "#block624",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "#block937", "node-name": "#block937",
"read-only": true, "read-only": true,
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "#block869",
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1483605920",
"node-name": "#block869",
"read-only": true,
"discard": "unmap"
},
"backing": "#block1157" "backing": "#block1157"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1483605920",
"node-name": "#block869",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "#block1157", "node-name": "#block1157",
"read-only": true, "read-only": true,
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "#block1047",
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1483546244",
"node-name": "#block1047",
"read-only": true,
"discard": "unmap"
},
"backing": "#block1392" "backing": "#block1392"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1483546244",
"node-name": "#block1047",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "#block1392", "node-name": "#block1392",
"read-only": true, "read-only": true,
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "#block1279",
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1483545901",
"node-name": "#block1279",
"read-only": true,
"discard": "unmap"
},
"backing": "#block1523" "backing": "#block1523"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1483545901",
"node-name": "#block1279",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "#block1523", "node-name": "#block1523",
"read-only": true, "read-only": true,
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "#block1444",
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1483545313",
"node-name": "#block1444",
"read-only": true,
"discard": "unmap"
},
"backing": "#block1742" "backing": "#block1742"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1483545313",
"node-name": "#block1444",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "#block1742", "node-name": "#block1742",
"read-only": true, "read-only": true,
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "#block1602",
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
"node-name": "#block1602",
"read-only": true,
"discard": "unmap"
},
"backing": "#block1909" "backing": "#block1909"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
"node-name": "#block1602",
"read-only": true,
"discard": "unmap"
}
{ {
"node-name": "#block1909", "node-name": "#block1909",
"read-only": true, "read-only": true,
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "#block1864",
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
"node-name": "#block1864",
"read-only": true,
"discard": "unmap"
},
"backing": null "backing": null
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
"node-name": "#block1864",
"read-only": true,
"discard": "unmap"
}
tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminated.json
浏览文件 @ b8240fe7
...@@ -2,24 +2,26 @@ ...@@ -2,24 +2,26 @@
"node-name": "#block126", "node-name": "#block126",
"read-only": false, "read-only": false,
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "#block004",
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1507297895",
"node-name": "#block004",
"read-only": false,
"discard": "unmap"
},
"backing": "#block313" "backing": "#block313"
} }
{
"driver": "file",
"filename": "/var/lib/libvirt/images/rhel7.3.1507297895",
"node-name": "#block004",
"read-only": false,
"discard": "unmap"
}
{ {
"node-name": "#block313", "node-name": "#block313",
"read-only": true, "read-only": true,
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "#block256"
"driver": "file", }
"filename": "/var/lib/libvirt/images/rhel7.3.1484071872", {
"node-name": "#block256", "driver": "file",
"read-only": true, "filename": "/var/lib/libvirt/images/rhel7.3.1484071872",
"discard": "unmap" "node-name": "#block256",
} "read-only": true,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-raw-aio_native.json
浏览文件 @ b8240fe7
...@@ -6,16 +6,17 @@ ...@@ -6,16 +6,17 @@
"no-flush": false "no-flush": false
}, },
"driver": "raw", "driver": "raw",
"file": { "file": "test2"
"driver": "file", }
"filename": "/path/to/i.img", {
"aio": "native", "driver": "file",
"node-name": "test2", "filename": "/path/to/i.img",
"cache": { "aio": "native",
"direct": true, "node-name": "test2",
"no-flush": false "cache": {
}, "direct": true,
"read-only": false, "no-flush": false
"discard": "unmap" },
} "read-only": false,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-raw-luks.json
浏览文件 @ b8240fe7
...@@ -3,11 +3,12 @@ ...@@ -3,11 +3,12 @@
"read-only": false, "read-only": false,
"driver": "luks", "driver": "luks",
"key-secret": "test1-encalias", "key-secret": "test1-encalias",
"file": { "file": "test2"
"driver": "file", }
"filename": "/path/luks.img", {
"node-name": "test2", "driver": "file",
"read-only": false, "filename": "/path/luks.img",
"discard": "unmap" "node-name": "test2",
} "read-only": false,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-raw-noopts.json
浏览文件 @ b8240fe7
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
"node-name": "0123456789ABCDEF0123456789ABCDE", "node-name": "0123456789ABCDEF0123456789ABCDE",
"read-only": false, "read-only": false,
"driver": "raw", "driver": "raw",
"file": { "file": "0123456789ABCDEF0123456789ABCDE"
"driver": "file", }
"filename": "/var/lib/libvirt/images/i.img", {
"node-name": "0123456789ABCDEF0123456789ABCDE", "driver": "file",
"read-only": false, "filename": "/var/lib/libvirt/images/i.img",
"discard": "unmap" "node-name": "0123456789ABCDEF0123456789ABCDE",
} "read-only": false,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-vdi-noopts.json
浏览文件 @ b8240fe7
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
"node-name": "test1", "node-name": "test1",
"read-only": false, "read-only": false,
"driver": "vdi", "driver": "vdi",
"file": { "file": "test2"
"driver": "file", }
"filename": "/path/to/i.img", {
"node-name": "test2", "driver": "file",
"read-only": false, "filename": "/path/to/i.img",
"discard": "unmap" "node-name": "test2",
} "read-only": false,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-vhd-noopts.json
浏览文件 @ b8240fe7
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
"node-name": "test1", "node-name": "test1",
"read-only": false, "read-only": false,
"driver": "vhdx", "driver": "vhdx",
"file": { "file": "test2"
"driver": "file", }
"filename": "/path/to/i.img", {
"node-name": "test2", "driver": "file",
"read-only": false, "filename": "/path/to/i.img",
"discard": "unmap" "node-name": "test2",
} "read-only": false,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/file-vpc-noopts.json
浏览文件 @ b8240fe7
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
"node-name": "test1", "node-name": "test1",
"read-only": false, "read-only": false,
"driver": "vpc", "driver": "vpc",
"file": { "file": "test2"
"driver": "file", }
"filename": "/path/to/i.img", {
"node-name": "test2", "driver": "file",
"read-only": false, "filename": "/path/to/i.img",
"discard": "unmap" "node-name": "test2",
} "read-only": false,
"discard": "unmap"
} }
tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe.json
浏览文件 @ b8240fe7
...@@ -6,30 +6,31 @@ ...@@ -6,30 +6,31 @@
"no-flush": true "no-flush": true
}, },
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "node-a-s",
"driver": "rbd", "backing": "node-b-f"
"pool": "rbdpool", }
"image": "rbdimg", {
"server": [ "driver": "rbd",
{ "pool": "rbdpool",
"host": "host1.example.com", "image": "rbdimg",
"port": "0" "server": [
}, {
{ "host": "host1.example.com",
"host": "host2.example.com", "port": "0"
"port": "0"
}
],
"user": "testuser-rbd",
"node-name": "node-a-s",
"cache": {
"direct": false,
"no-flush": true
}, },
"read-only": false, {
"discard": "unmap" "host": "host2.example.com",
"port": "0"
}
],
"user": "testuser-rbd",
"node-name": "node-a-s",
"cache": {
"direct": false,
"no-flush": true
}, },
"backing": "node-b-f" "read-only": false,
"discard": "unmap"
} }
{ {
"node-name": "node-b-f", "node-name": "node-b-f",
...@@ -39,19 +40,20 @@ ...@@ -39,19 +40,20 @@
"no-flush": true "no-flush": true
}, },
"driver": "qcow2", "driver": "qcow2",
"file": { "file": "node-b-s",
"driver": "iscsi",
"portal": "example.org:3260",
"target": "iscsitarget",
"lun": 1,
"transport": "tcp",
"node-name": "node-b-s",
"cache": {
"direct": false,
"no-flush": true
},
"read-only": true,
"discard": "unmap"
},
"backing": null "backing": null
} }
{
"driver": "iscsi",
"portal": "example.org:3260",
"target": "iscsitarget",
"lun": 1,
"transport": "tcp",
"node-name": "node-b-s",
"cache": {
"direct": false,
"no-flush": true
},
"read-only": true,
"discard": "unmap"
}
tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.json
浏览文件 @ b8240fe7
...@@ -6,27 +6,28 @@ ...@@ -6,27 +6,28 @@
"format": "luks", "format": "luks",
"key-secret": "node-b-f-encalias" "key-secret": "node-b-f-encalias"
}, },
"file": { "file": "node-a-s",
"driver": "rbd",
"pool": "rbdpool",
"image": "rbdimg",
"server": [
{
"host": "host1.example.com",
"port": "0"
},
{
"host": "host2.example.com",
"port": "0"
}
],
"user": "testuser-rbd",
"node-name": "node-a-s",
"read-only": false,
"discard": "unmap"
},
"backing": "node-b-f" "backing": "node-b-f"
} }
{
"driver": "rbd",
"pool": "rbdpool",
"image": "rbdimg",
"server": [
{
"host": "host1.example.com",
"port": "0"
},
{
"host": "host2.example.com",
"port": "0"
}
],
"user": "testuser-rbd",
"node-name": "node-a-s",
"read-only": false,
"discard": "unmap"
}
{ {
"node-name": "node-b-f", "node-name": "node-b-f",
"read-only": true, "read-only": true,
...@@ -35,17 +36,18 @@ ...@@ -35,17 +36,18 @@
"format": "aes", "format": "aes",
"key-secret": "node-b-f-encalias" "key-secret": "node-b-f-encalias"
}, },
"file": { "file": "node-b-s",
"driver": "iscsi",
"portal": "example.org:3260",
"target": "iqn.2016-09.com.example:iscsitarget",
"lun": 1,
"transport": "tcp",
"user": "testuser-iscsi",
"password-secret": "node-b-s-secalias",
"node-name": "node-b-s",
"read-only": true,
"discard": "unmap"
},
"backing": null "backing": null
} }
{
"driver": "iscsi",
"portal": "example.org:3260",
"target": "iqn.2016-09.com.example:iscsitarget",
"lun": 1,
"transport": "tcp",
"user": "testuser-iscsi",
"password-secret": "node-b-s-secalias",
"node-name": "node-b-s",
"read-only": true,
"discard": "unmap"
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或