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: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_block.c | 8 +- tests/qemublocktest.c | 11 +- .../xml2json/block-raw-noopts.json | 15 ++- .../qemublocktestdata/xml2json/dir-fat-cache.json | 27 ++-- .../qemublocktestdata/xml2json/dir-fat-floppy.json | 19 +-- .../xml2json/dir-fat-readonly.json | 19 +-- .../xml2json/file-backing_basic-aio_threads.json | 82 +++++------ .../file-backing_basic-cache-directsync.json | 108 ++++++++------- .../xml2json/file-backing_basic-cache-none.json | 108 ++++++++------- .../xml2json/file-backing_basic-cache-unsafe.json | 108 ++++++++------- .../file-backing_basic-cache-writeback.json | 108 ++++++++------- .../file-backing_basic-cache-writethrough.json | 108 ++++++++------- .../xml2json/file-backing_basic-detect.json | 76 ++++++----- .../xml2json/file-backing_basic-noopts.json | 60 +++++---- .../xml2json/file-backing_basic-unmap-detect.json | 76 ++++++----- .../xml2json/file-backing_basic-unmap-ignore.json | 76 ++++++----- .../xml2json/file-backing_basic-unmap.json | 76 ++++++----- .../xml2json/file-bochs-noopts.json | 15 ++- .../xml2json/file-cloop-noopts.json | 15 ++- .../xml2json/file-dmg-noopts.json | 15 ++- .../xml2json/file-ploop-noopts.json | 15 ++- .../file-qcow2-backing-chain-encryption.json | 30 +++-- .../xml2json/file-qcow2-backing-chain-noopts.json | 150 +++++++++++---------- .../file-qcow2-backing-chain-unterminated.json | 30 +++-- .../xml2json/file-raw-aio_native.json | 25 ++-- .../qemublocktestdata/xml2json/file-raw-luks.json | 15 ++- .../xml2json/file-raw-noopts.json | 15 ++- .../xml2json/file-vdi-noopts.json | 15 ++- .../xml2json/file-vhd-noopts.json | 15 ++- .../xml2json/file-vpc-noopts.json | 15 ++- .../network-qcow2-backing-chain-cache-unsafe.json | 74 +++++----- ...etwork-qcow2-backing-chain-encryption_auth.json | 64 ++++----- 32 files changed, 834 insertions(+), 759 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 12f37cda01..a514e8a055 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -1432,7 +1432,6 @@ virJSONValuePtr qemuBlockStorageSourceGetBlockdevProps(virStorageSourcePtr src) { bool backingSupported = src->format >= VIR_STORAGE_FILE_BACKING; - virJSONValuePtr storage = NULL; virJSONValuePtr props = NULL; virJSONValuePtr ret = NULL; @@ -1446,13 +1445,9 @@ qemuBlockStorageSourceGetBlockdevProps(virStorageSourcePtr src) if (!(props = qemuBlockStorageSourceGetBlockdevFormatProps(src))) goto cleanup; - if (!(storage = qemuBlockStorageSourceGetBackendProps(src, false))) + if (virJSONValueObjectAppendString(props, "file", src->nodestorage) < 0) goto cleanup; - if (virJSONValueObjectAppend(props, "file", storage) < 0) - goto cleanup; - storage = NULL; - if (src->backingStore && backingSupported) { if (virStorageSourceHasBacking(src)) { if (virJSONValueObjectAppendString(props, "backing", @@ -1469,7 +1464,6 @@ qemuBlockStorageSourceGetBlockdevProps(virStorageSourcePtr src) VIR_STEAL_PTR(ret, props); cleanup: - virJSONValueFree(storage); virJSONValueFree(props); return ret; } diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index eae1ca8ee3..d671505969 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -191,7 +191,8 @@ testQemuDiskXMLToProps(const void *opaque) struct testQemuDiskXMLToJSONData *data = (void *) opaque; virDomainDiskDefPtr disk = NULL; virStorageSourcePtr n; - virJSONValuePtr props = NULL; + virJSONValuePtr formatProps = NULL; + virJSONValuePtr storageProps = NULL; char *xmlpath = NULL; char *xmlstr = NULL; int ret = -1; @@ -221,7 +222,8 @@ testQemuDiskXMLToProps(const void *opaque) if (testQemuDiskXMLToJSONFakeSecrets(n) < 0) goto cleanup; - if (!(props = qemuBlockStorageSourceGetBlockdevProps(n))) { + if (!(formatProps = qemuBlockStorageSourceGetBlockdevProps(n)) || + !(storageProps = qemuBlockStorageSourceGetBackendProps(n, false))) { if (!data->fail) { VIR_TEST_VERBOSE("failed to generate qemu blockdev props\n"); goto cleanup; @@ -231,13 +233,16 @@ testQemuDiskXMLToProps(const void *opaque) 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; } ret = 0; cleanup: + virJSONValueFree(formatProps); + virJSONValueFree(storageProps); virDomainDiskDefFree(disk); VIR_FREE(xmlpath); VIR_FREE(xmlstr); diff --git a/tests/qemublocktestdata/xml2json/block-raw-noopts.json b/tests/qemublocktestdata/xml2json/block-raw-noopts.json index 25bf77d5aa..f223659c76 100644 --- a/tests/qemublocktestdata/xml2json/block-raw-noopts.json +++ b/tests/qemublocktestdata/xml2json/block-raw-noopts.json @@ -2,11 +2,12 @@ "node-name": "0123456789ABCDEF0123456789ABCDE", "read-only": false, "driver": "raw", - "file": { - "driver": "host_device", - "filename": "/dev/blah", - "node-name": "0123456789ABCDEF0123456789ABCDE", - "read-only": false, - "discard": "unmap" - } + "file": "0123456789ABCDEF0123456789ABCDE" +} +{ + "driver": "host_device", + "filename": "/dev/blah", + "node-name": "0123456789ABCDEF0123456789ABCDE", + "read-only": false, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/dir-fat-cache.json b/tests/qemublocktestdata/xml2json/dir-fat-cache.json index 8c0a045ed5..ef33add681 100644 --- a/tests/qemublocktestdata/xml2json/dir-fat-cache.json +++ b/tests/qemublocktestdata/xml2json/dir-fat-cache.json @@ -6,17 +6,18 @@ "no-flush": false }, "driver": "raw", - "file": { - "driver": "vvfat", - "dir": "/var/somefiles", - "floppy": false, - "rw": false, - "node-name": "node-s", - "cache": { - "direct": true, - "no-flush": false - }, - "read-only": true, - "discard": "unmap" - } + "file": "node-s" +} +{ + "driver": "vvfat", + "dir": "/var/somefiles", + "floppy": false, + "rw": false, + "node-name": "node-s", + "cache": { + "direct": true, + "no-flush": false + }, + "read-only": true, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/dir-fat-floppy.json b/tests/qemublocktestdata/xml2json/dir-fat-floppy.json index 9685acaa8b..db7954a6bc 100644 --- a/tests/qemublocktestdata/xml2json/dir-fat-floppy.json +++ b/tests/qemublocktestdata/xml2json/dir-fat-floppy.json @@ -2,13 +2,14 @@ "node-name": "node-f", "read-only": true, "driver": "raw", - "file": { - "driver": "vvfat", - "dir": "/var/somefiles", - "floppy": true, - "rw": false, - "node-name": "node-s", - "read-only": true, - "discard": "unmap" - } + "file": "node-s" +} +{ + "driver": "vvfat", + "dir": "/var/somefiles", + "floppy": true, + "rw": false, + "node-name": "node-s", + "read-only": true, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/dir-fat-readonly.json b/tests/qemublocktestdata/xml2json/dir-fat-readonly.json index 7d35d255cc..a306fb4d47 100644 --- a/tests/qemublocktestdata/xml2json/dir-fat-readonly.json +++ b/tests/qemublocktestdata/xml2json/dir-fat-readonly.json @@ -2,13 +2,14 @@ "node-name": "node-f", "read-only": true, "driver": "raw", - "file": { - "driver": "vvfat", - "dir": "/var/somefiles", - "floppy": false, - "rw": false, - "node-name": "node-s", - "read-only": true, - "discard": "unmap" - } + "file": "node-s" +} +{ + "driver": "vvfat", + "dir": "/var/somefiles", + "floppy": false, + "rw": false, + "node-name": "node-s", + "read-only": true, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json index dcaf905085..a9bdd1bcc2 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json @@ -2,61 +2,65 @@ "node-name": "node-a-f", "read-only": false, "driver": "qcow", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/a", - "aio": "threads", - "node-name": "node-a-s", - "read-only": false, - "discard": "unmap" - }, + "file": "node-a-s", "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", "read-only": true, "driver": "qed", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/b", - "aio": "threads", - "node-name": "node-b-s", - "read-only": true, - "discard": "unmap" - }, + "file": "node-b-s", "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", "read-only": true, "driver": "vmdk", - "file": { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ], - "node-name": "node-c-s", - "read-only": true, - "discard": "unmap" - }, + "file": "node-c-s", "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", "read-only": true, "driver": "raw", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/d", - "aio": "threads", - "node-name": "node-d-s", - "read-only": true, - "discard": "unmap" - } + "file": "node-d-s" +} +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/d", + "aio": "threads", + "node-name": "node-d-s", + "read-only": true, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.json index 023caf013f..18cd183cd8 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.json @@ -6,19 +6,20 @@ "no-flush": false }, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/a", - "node-name": "node-a-s", - "cache": { - "direct": true, - "no-flush": false - }, - "read-only": false, - "discard": "unmap" - }, + "file": "node-a-s", "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", "read-only": true, @@ -27,19 +28,20 @@ "no-flush": false }, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/b", - "node-name": "node-b-s", - "cache": { - "direct": true, - "no-flush": false - }, - "read-only": true, - "discard": "unmap" - }, + "file": "node-b-s", "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", "read-only": true, @@ -48,27 +50,28 @@ "no-flush": false }, "driver": "qcow2", - "file": { - "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" - }, + "file": "node-c-s", "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", "read-only": true, @@ -77,15 +80,16 @@ "no-flush": false }, "driver": "raw", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/d", - "node-name": "node-d-s", - "cache": { - "direct": true, - "no-flush": false - }, - "read-only": true, - "discard": "unmap" - } + "file": "node-d-s" +} +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/d", + "node-name": "node-d-s", + "cache": { + "direct": true, + "no-flush": false + }, + "read-only": true, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json index 023caf013f..18cd183cd8 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json @@ -6,19 +6,20 @@ "no-flush": false }, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/a", - "node-name": "node-a-s", - "cache": { - "direct": true, - "no-flush": false - }, - "read-only": false, - "discard": "unmap" - }, + "file": "node-a-s", "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", "read-only": true, @@ -27,19 +28,20 @@ "no-flush": false }, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/b", - "node-name": "node-b-s", - "cache": { - "direct": true, - "no-flush": false - }, - "read-only": true, - "discard": "unmap" - }, + "file": "node-b-s", "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", "read-only": true, @@ -48,27 +50,28 @@ "no-flush": false }, "driver": "qcow2", - "file": { - "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" - }, + "file": "node-c-s", "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", "read-only": true, @@ -77,15 +80,16 @@ "no-flush": false }, "driver": "raw", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/d", - "node-name": "node-d-s", - "cache": { - "direct": true, - "no-flush": false - }, - "read-only": true, - "discard": "unmap" - } + "file": "node-d-s" +} +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/d", + "node-name": "node-d-s", + "cache": { + "direct": true, + "no-flush": false + }, + "read-only": true, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json index 5f6b94a9d5..4e92061c65 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json @@ -6,19 +6,20 @@ "no-flush": true }, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/a", - "node-name": "node-a-s", - "cache": { - "direct": false, - "no-flush": true - }, - "read-only": false, - "discard": "unmap" - }, + "file": "node-a-s", "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", "read-only": true, @@ -27,19 +28,20 @@ "no-flush": true }, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/b", - "node-name": "node-b-s", - "cache": { - "direct": false, - "no-flush": true - }, - "read-only": true, - "discard": "unmap" - }, + "file": "node-b-s", "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", "read-only": true, @@ -48,27 +50,28 @@ "no-flush": true }, "driver": "qcow2", - "file": { - "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" - }, + "file": "node-c-s", "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", "read-only": true, @@ -77,15 +80,16 @@ "no-flush": true }, "driver": "raw", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/d", - "node-name": "node-d-s", - "cache": { - "direct": false, - "no-flush": true - }, - "read-only": true, - "discard": "unmap" - } + "file": "node-d-s" +} +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/d", + "node-name": "node-d-s", + "cache": { + "direct": false, + "no-flush": true + }, + "read-only": true, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json index 9dc7d38850..a105b47483 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json @@ -6,19 +6,20 @@ "no-flush": false }, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/a", - "node-name": "node-a-s", - "cache": { - "direct": false, - "no-flush": false - }, - "read-only": false, - "discard": "unmap" - }, + "file": "node-a-s", "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", "read-only": true, @@ -27,19 +28,20 @@ "no-flush": false }, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/b", - "node-name": "node-b-s", - "cache": { - "direct": false, - "no-flush": false - }, - "read-only": true, - "discard": "unmap" - }, + "file": "node-b-s", "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", "read-only": true, @@ -48,27 +50,28 @@ "no-flush": false }, "driver": "qcow2", - "file": { - "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" - }, + "file": "node-c-s", "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", "read-only": true, @@ -77,15 +80,16 @@ "no-flush": false }, "driver": "raw", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/d", - "node-name": "node-d-s", - "cache": { - "direct": false, - "no-flush": false - }, - "read-only": true, - "discard": "unmap" - } + "file": "node-d-s" +} +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/d", + "node-name": "node-d-s", + "cache": { + "direct": false, + "no-flush": false + }, + "read-only": true, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json index 9dc7d38850..a105b47483 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json @@ -6,19 +6,20 @@ "no-flush": false }, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/a", - "node-name": "node-a-s", - "cache": { - "direct": false, - "no-flush": false - }, - "read-only": false, - "discard": "unmap" - }, + "file": "node-a-s", "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", "read-only": true, @@ -27,19 +28,20 @@ "no-flush": false }, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/b", - "node-name": "node-b-s", - "cache": { - "direct": false, - "no-flush": false - }, - "read-only": true, - "discard": "unmap" - }, + "file": "node-b-s", "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", "read-only": true, @@ -48,27 +50,28 @@ "no-flush": false }, "driver": "qcow2", - "file": { - "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" - }, + "file": "node-c-s", "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", "read-only": true, @@ -77,15 +80,16 @@ "no-flush": false }, "driver": "raw", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/d", - "node-name": "node-d-s", - "cache": { - "direct": false, - "no-flush": false - }, - "read-only": true, - "discard": "unmap" - } + "file": "node-d-s" +} +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/d", + "node-name": "node-d-s", + "cache": { + "direct": false, + "no-flush": false + }, + "read-only": true, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json b/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json index c1e4c40757..44a6e90fcd 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json @@ -3,58 +3,62 @@ "read-only": false, "detect-zeroes": "on", "driver": "qcow", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/a", - "node-name": "node-a-s", - "read-only": false, - "discard": "unmap" - }, + "file": "node-a-s", "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", "read-only": true, "driver": "qed", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/b", - "node-name": "node-b-s", - "read-only": true, - "discard": "unmap" - }, + "file": "node-b-s", "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", "read-only": true, "driver": "vmdk", - "file": { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ], - "node-name": "node-c-s", - "read-only": true, - "discard": "unmap" - }, + "file": "node-c-s", "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", "read-only": true, "driver": "raw", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/d", - "node-name": "node-d-s", - "read-only": true, - "discard": "unmap" - } + "file": "node-d-s" +} +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/d", + "node-name": "node-d-s", + "read-only": true, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-noopts.json b/tests/qemublocktestdata/xml2json/file-backing_basic-noopts.json index 3285a6ec67..b0fd9b6988 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-noopts.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-noopts.json @@ -2,50 +2,54 @@ "node-name": "node-a-f", "read-only": false, "driver": "qed", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/a", - "node-name": "node-a-s", - "read-only": false, - "discard": "unmap" - }, + "file": "node-a-s", "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", "read-only": true, "driver": "qcow", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/b", - "node-name": "node-b-s", - "read-only": true, - "discard": "unmap" - }, + "file": "node-b-s", "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", "read-only": true, "driver": "vmdk", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/c", - "node-name": "node-c-s", - "read-only": true, - "discard": "unmap" - }, + "file": "node-c-s", "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", "read-only": true, "driver": "raw", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/d", - "node-name": "node-d-s", - "read-only": true, - "discard": "unmap" - } + "file": "node-d-s" +} +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/d", + "node-name": "node-d-s", + "read-only": true, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json index b00008dd54..6cf4e77090 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json @@ -4,61 +4,65 @@ "discard": "unmap", "detect-zeroes": "unmap", "driver": "qcow", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/a", - "node-name": "node-a-s", - "read-only": false, - "discard": "unmap" - }, + "file": "node-a-s", "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", "read-only": true, "discard": "unmap", "driver": "qed", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/b", - "node-name": "node-b-s", - "read-only": true, - "discard": "unmap" - }, + "file": "node-b-s", "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", "read-only": true, "discard": "unmap", "driver": "vmdk", - "file": { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ], - "node-name": "node-c-s", - "read-only": true, - "discard": "unmap" - }, + "file": "node-c-s", "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", "read-only": true, "discard": "unmap", "driver": "raw", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/d", - "node-name": "node-d-s", - "read-only": true, - "discard": "unmap" - } + "file": "node-d-s" +} +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/d", + "node-name": "node-d-s", + "read-only": true, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json index 5419deafc0..b6e454297f 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json @@ -4,61 +4,65 @@ "discard": "ignore", "detect-zeroes": "on", "driver": "qcow", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/a", - "node-name": "node-a-s", - "read-only": false, - "discard": "unmap" - }, + "file": "node-a-s", "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", "read-only": true, "discard": "ignore", "driver": "qed", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/b", - "node-name": "node-b-s", - "read-only": true, - "discard": "unmap" - }, + "file": "node-b-s", "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", "read-only": true, "discard": "ignore", "driver": "vmdk", - "file": { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ], - "node-name": "node-c-s", - "read-only": true, - "discard": "unmap" - }, + "file": "node-c-s", "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", "read-only": true, "discard": "ignore", "driver": "raw", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/d", - "node-name": "node-d-s", - "read-only": true, - "discard": "unmap" - } + "file": "node-d-s" +} +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/d", + "node-name": "node-d-s", + "read-only": true, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json index 1efc462c06..21a10c8543 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json @@ -3,61 +3,65 @@ "read-only": false, "discard": "unmap", "driver": "qcow", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/a", - "node-name": "node-a-s", - "read-only": false, - "discard": "unmap" - }, + "file": "node-a-s", "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", "read-only": true, "discard": "unmap", "driver": "qed", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/b", - "node-name": "node-b-s", - "read-only": true, - "discard": "unmap" - }, + "file": "node-b-s", "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", "read-only": true, "discard": "unmap", "driver": "vmdk", - "file": { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ], - "node-name": "node-c-s", - "read-only": true, - "discard": "unmap" - }, + "file": "node-c-s", "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", "read-only": true, "discard": "unmap", "driver": "raw", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/d", - "node-name": "node-d-s", - "read-only": true, - "discard": "unmap" - } + "file": "node-d-s" +} +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/d", + "node-name": "node-d-s", + "read-only": true, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-bochs-noopts.json b/tests/qemublocktestdata/xml2json/file-bochs-noopts.json index 22e2560998..6ab43b2a1c 100644 --- a/tests/qemublocktestdata/xml2json/file-bochs-noopts.json +++ b/tests/qemublocktestdata/xml2json/file-bochs-noopts.json @@ -2,11 +2,12 @@ "node-name": "test1", "read-only": false, "driver": "bochs", - "file": { - "driver": "file", - "filename": "/path/to/i.img", - "node-name": "test2", - "read-only": false, - "discard": "unmap" - } + "file": "test2" +} +{ + "driver": "file", + "filename": "/path/to/i.img", + "node-name": "test2", + "read-only": false, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-cloop-noopts.json b/tests/qemublocktestdata/xml2json/file-cloop-noopts.json index b72bb5df56..f709c3d3bd 100644 --- a/tests/qemublocktestdata/xml2json/file-cloop-noopts.json +++ b/tests/qemublocktestdata/xml2json/file-cloop-noopts.json @@ -2,11 +2,12 @@ "node-name": "test1", "read-only": false, "driver": "cloop", - "file": { - "driver": "file", - "filename": "/path/to/i.img", - "node-name": "test2", - "read-only": false, - "discard": "unmap" - } + "file": "test2" +} +{ + "driver": "file", + "filename": "/path/to/i.img", + "node-name": "test2", + "read-only": false, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-dmg-noopts.json b/tests/qemublocktestdata/xml2json/file-dmg-noopts.json index 9f2912b8d3..55261de4b2 100644 --- a/tests/qemublocktestdata/xml2json/file-dmg-noopts.json +++ b/tests/qemublocktestdata/xml2json/file-dmg-noopts.json @@ -2,11 +2,12 @@ "node-name": "test1", "read-only": false, "driver": "dmg", - "file": { - "driver": "file", - "filename": "/path/to/i.img", - "node-name": "test2", - "read-only": false, - "discard": "unmap" - } + "file": "test2" +} +{ + "driver": "file", + "filename": "/path/to/i.img", + "node-name": "test2", + "read-only": false, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-ploop-noopts.json b/tests/qemublocktestdata/xml2json/file-ploop-noopts.json index 64006d28a3..81fa263098 100644 --- a/tests/qemublocktestdata/xml2json/file-ploop-noopts.json +++ b/tests/qemublocktestdata/xml2json/file-ploop-noopts.json @@ -2,11 +2,12 @@ "node-name": "test1", "read-only": false, "driver": "parallels", - "file": { - "driver": "file", - "filename": "/path/to/i.img", - "node-name": "test2", - "read-only": false, - "discard": "unmap" - } + "file": "test2" +} +{ + "driver": "file", + "filename": "/path/to/i.img", + "node-name": "test2", + "read-only": false, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.json b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.json index 94e2ecd1e2..3469c06654 100644 --- a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.json +++ b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.json @@ -6,15 +6,16 @@ "format": "luks", "key-secret": "node-b-f-encalias" }, - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/a", - "node-name": "node-a-s", - "read-only": false, - "discard": "unmap" - }, + "file": "node-a-s", "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", "read-only": true, @@ -23,12 +24,13 @@ "format": "aes", "key-secret": "node-b-f-encalias" }, - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/b", - "node-name": "node-b-s", - "read-only": true, - "discard": "unmap" - }, + "file": "node-b-s", "backing": null } +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/b", + "node-name": "node-b-s", + "read-only": true, + "discard": "unmap" +} diff --git a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts.json b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts.json index 3e7c08f080..6bc6e2fe30 100644 --- a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts.json +++ b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts.json @@ -2,129 +2,139 @@ "node-name": "#block126", "read-only": false, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1507297895", - "node-name": "#block004", - "read-only": false, - "discard": "unmap" - }, + "file": "#block004", "backing": "#block313" } +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1507297895", + "node-name": "#block004", + "read-only": false, + "discard": "unmap" +} { "node-name": "#block313", "read-only": true, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1484071872", - "node-name": "#block256", - "read-only": true, - "discard": "unmap" - }, + "file": "#block256", "backing": "#block556" } +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1484071872", + "node-name": "#block256", + "read-only": true, + "discard": "unmap" +} { "node-name": "#block556", "read-only": true, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1483615252", - "node-name": "#block418", - "read-only": true, - "discard": "unmap" - }, + "file": "#block418", "backing": "#block767" } +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1483615252", + "node-name": "#block418", + "read-only": true, + "discard": "unmap" +} { "node-name": "#block767", "read-only": true, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1483605924", - "node-name": "#block624", - "read-only": true, - "discard": "unmap" - }, + "file": "#block624", "backing": "#block937" } +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1483605924", + "node-name": "#block624", + "read-only": true, + "discard": "unmap" +} { "node-name": "#block937", "read-only": true, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1483605920", - "node-name": "#block869", - "read-only": true, - "discard": "unmap" - }, + "file": "#block869", "backing": "#block1157" } +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1483605920", + "node-name": "#block869", + "read-only": true, + "discard": "unmap" +} { "node-name": "#block1157", "read-only": true, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1483546244", - "node-name": "#block1047", - "read-only": true, - "discard": "unmap" - }, + "file": "#block1047", "backing": "#block1392" } +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1483546244", + "node-name": "#block1047", + "read-only": true, + "discard": "unmap" +} { "node-name": "#block1392", "read-only": true, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1483545901", - "node-name": "#block1279", - "read-only": true, - "discard": "unmap" - }, + "file": "#block1279", "backing": "#block1523" } +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1483545901", + "node-name": "#block1279", + "read-only": true, + "discard": "unmap" +} { "node-name": "#block1523", "read-only": true, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1483545313", - "node-name": "#block1444", - "read-only": true, - "discard": "unmap" - }, + "file": "#block1444", "backing": "#block1742" } +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1483545313", + "node-name": "#block1444", + "read-only": true, + "discard": "unmap" +} { "node-name": "#block1742", "read-only": true, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1483536402", - "node-name": "#block1602", - "read-only": true, - "discard": "unmap" - }, + "file": "#block1602", "backing": "#block1909" } +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1483536402", + "node-name": "#block1602", + "read-only": true, + "discard": "unmap" +} { "node-name": "#block1909", "read-only": true, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.qcow2", - "node-name": "#block1864", - "read-only": true, - "discard": "unmap" - }, + "file": "#block1864", "backing": null } +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.qcow2", + "node-name": "#block1864", + "read-only": true, + "discard": "unmap" +} diff --git a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminated.json b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminated.json index 8fcdc48bb0..454c07faec 100644 --- a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminated.json +++ b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminated.json @@ -2,24 +2,26 @@ "node-name": "#block126", "read-only": false, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1507297895", - "node-name": "#block004", - "read-only": false, - "discard": "unmap" - }, + "file": "#block004", "backing": "#block313" } +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1507297895", + "node-name": "#block004", + "read-only": false, + "discard": "unmap" +} { "node-name": "#block313", "read-only": true, "driver": "qcow2", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1484071872", - "node-name": "#block256", - "read-only": true, - "discard": "unmap" - } + "file": "#block256" +} +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1484071872", + "node-name": "#block256", + "read-only": true, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-raw-aio_native.json b/tests/qemublocktestdata/xml2json/file-raw-aio_native.json index 2752e0b204..4e63561311 100644 --- a/tests/qemublocktestdata/xml2json/file-raw-aio_native.json +++ b/tests/qemublocktestdata/xml2json/file-raw-aio_native.json @@ -6,16 +6,17 @@ "no-flush": false }, "driver": "raw", - "file": { - "driver": "file", - "filename": "/path/to/i.img", - "aio": "native", - "node-name": "test2", - "cache": { - "direct": true, - "no-flush": false - }, - "read-only": false, - "discard": "unmap" - } + "file": "test2" +} +{ + "driver": "file", + "filename": "/path/to/i.img", + "aio": "native", + "node-name": "test2", + "cache": { + "direct": true, + "no-flush": false + }, + "read-only": false, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-raw-luks.json b/tests/qemublocktestdata/xml2json/file-raw-luks.json index e3d9c4c26b..c26dd3bba5 100644 --- a/tests/qemublocktestdata/xml2json/file-raw-luks.json +++ b/tests/qemublocktestdata/xml2json/file-raw-luks.json @@ -3,11 +3,12 @@ "read-only": false, "driver": "luks", "key-secret": "test1-encalias", - "file": { - "driver": "file", - "filename": "/path/luks.img", - "node-name": "test2", - "read-only": false, - "discard": "unmap" - } + "file": "test2" +} +{ + "driver": "file", + "filename": "/path/luks.img", + "node-name": "test2", + "read-only": false, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-raw-noopts.json b/tests/qemublocktestdata/xml2json/file-raw-noopts.json index 25de571428..cace1f6448 100644 --- a/tests/qemublocktestdata/xml2json/file-raw-noopts.json +++ b/tests/qemublocktestdata/xml2json/file-raw-noopts.json @@ -2,11 +2,12 @@ "node-name": "0123456789ABCDEF0123456789ABCDE", "read-only": false, "driver": "raw", - "file": { - "driver": "file", - "filename": "/var/lib/libvirt/images/i.img", - "node-name": "0123456789ABCDEF0123456789ABCDE", - "read-only": false, - "discard": "unmap" - } + "file": "0123456789ABCDEF0123456789ABCDE" +} +{ + "driver": "file", + "filename": "/var/lib/libvirt/images/i.img", + "node-name": "0123456789ABCDEF0123456789ABCDE", + "read-only": false, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-vdi-noopts.json b/tests/qemublocktestdata/xml2json/file-vdi-noopts.json index ce8e359c91..15f9da2091 100644 --- a/tests/qemublocktestdata/xml2json/file-vdi-noopts.json +++ b/tests/qemublocktestdata/xml2json/file-vdi-noopts.json @@ -2,11 +2,12 @@ "node-name": "test1", "read-only": false, "driver": "vdi", - "file": { - "driver": "file", - "filename": "/path/to/i.img", - "node-name": "test2", - "read-only": false, - "discard": "unmap" - } + "file": "test2" +} +{ + "driver": "file", + "filename": "/path/to/i.img", + "node-name": "test2", + "read-only": false, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-vhd-noopts.json b/tests/qemublocktestdata/xml2json/file-vhd-noopts.json index d4b8e1f55a..ce96c4be8a 100644 --- a/tests/qemublocktestdata/xml2json/file-vhd-noopts.json +++ b/tests/qemublocktestdata/xml2json/file-vhd-noopts.json @@ -2,11 +2,12 @@ "node-name": "test1", "read-only": false, "driver": "vhdx", - "file": { - "driver": "file", - "filename": "/path/to/i.img", - "node-name": "test2", - "read-only": false, - "discard": "unmap" - } + "file": "test2" +} +{ + "driver": "file", + "filename": "/path/to/i.img", + "node-name": "test2", + "read-only": false, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/file-vpc-noopts.json b/tests/qemublocktestdata/xml2json/file-vpc-noopts.json index be1ec795a7..9cba99e567 100644 --- a/tests/qemublocktestdata/xml2json/file-vpc-noopts.json +++ b/tests/qemublocktestdata/xml2json/file-vpc-noopts.json @@ -2,11 +2,12 @@ "node-name": "test1", "read-only": false, "driver": "vpc", - "file": { - "driver": "file", - "filename": "/path/to/i.img", - "node-name": "test2", - "read-only": false, - "discard": "unmap" - } + "file": "test2" +} +{ + "driver": "file", + "filename": "/path/to/i.img", + "node-name": "test2", + "read-only": false, + "discard": "unmap" } diff --git a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe.json b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe.json index 6161f3375d..80a694eee4 100644 --- a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe.json +++ b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe.json @@ -6,30 +6,31 @@ "no-flush": true }, "driver": "qcow2", - "file": { - "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", - "cache": { - "direct": false, - "no-flush": true + "file": "node-a-s", + "backing": "node-b-f" +} +{ + "driver": "rbd", + "pool": "rbdpool", + "image": "rbdimg", + "server": [ + { + "host": "host1.example.com", + "port": "0" }, - "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", @@ -39,19 +40,20 @@ "no-flush": true }, "driver": "qcow2", - "file": { - "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" - }, + "file": "node-b-s", "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" +} diff --git a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.json b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.json index 7e7a4e44f7..6e5abbfbdd 100644 --- a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.json +++ b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.json @@ -6,27 +6,28 @@ "format": "luks", "key-secret": "node-b-f-encalias" }, - "file": { - "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" - }, + "file": "node-a-s", "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", "read-only": true, @@ -35,17 +36,18 @@ "format": "aes", "key-secret": "node-b-f-encalias" }, - "file": { - "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" - }, + "file": "node-b-s", "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" +} -- 2.16.2

The initiation of a synchronous block job in the NBD storage migration code was placed after entering the monitor thus after the lock on the VM object was unlocked. Thankfully nothing bad could happen in this situation since the migration job prevents any disk detaches or other modifications of the domain object. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_migration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index f753e42d1b..5fa2b4b56b 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -833,11 +833,12 @@ qemuMigrationSrcDriveMirror(virQEMUDriverPtr driver, hoststr, port, diskAlias) < 0)) goto cleanup; + qemuBlockJobSyncBegin(disk); + if (qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto cleanup; - qemuBlockJobSyncBegin(disk); /* Force "raw" format for NBD export */ mon_ret = qemuMonitorDriveMirror(priv->mon, diskAlias, nbd_dest, "raw", mirror_speed, 0, 0, mirror_flags); -- 2.16.2

Move formatting of the qemu command out of qemuMonitorJSONMakeCommandRaw to qemuMonitorJSONMakeCommandInternal to allow greater reusability and document the function better. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_monitor_json.c | 70 +++++++++++++++++++++++++++++++------------- 1 file changed, 49 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 6dcded9369..0b0fb7feba 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -464,40 +464,68 @@ qemuMonitorJSONHasError(virJSONValuePtr reply, } -/* Top-level commands and nested transaction list elements share a - * common structure for everything except the dictionary names. */ +/** + * qemuMonitorJSONMakeCommandInternal: + * @cmdname: QMP command name + * @arguments: a JSON object containing command arguments or NULL + * @transaction: format the command as arguments for the 'transaction' command + * + * Create a JSON object used on the QMP monitor to call a command. If + * @transaction is true, the returned object is formatted to be used as a member + * of the 'transaction' command. + * + * Note that @arguments is always consumed and should not be referenced after + * the call to this function. + */ +static virJSONValuePtr +qemuMonitorJSONMakeCommandInternal(const char *cmdname, + virJSONValuePtr arguments, + bool transaction) +{ + virJSONValuePtr cmd = NULL; + virJSONValuePtr ret = NULL; + + if (!transaction) { + if (virJSONValueObjectCreate(&cmd, + "s:execute", cmdname, + "A:arguments", &arguments, NULL) < 0) + goto cleanup; + } else { + if (virJSONValueObjectCreate(&cmd, + "s:type", cmdname, + "A:data", &arguments, NULL) < 0) + goto cleanup; + } + + VIR_STEAL_PTR(ret, cmd); + + cleanup: + virJSONValueFree(arguments); + virJSONValueFree(cmd); + return ret; +} + + static virJSONValuePtr ATTRIBUTE_SENTINEL -qemuMonitorJSONMakeCommandRaw(bool wrap, const char *cmdname, ...) +qemuMonitorJSONMakeCommandRaw(bool transaction, + const char *cmdname, + ...) { - virJSONValuePtr obj; + virJSONValuePtr obj = NULL; virJSONValuePtr jargs = NULL; va_list args; va_start(args, cmdname); - if (!(obj = virJSONValueNewObject())) - goto error; - - if (virJSONValueObjectAppendString(obj, wrap ? "type" : "execute", - cmdname) < 0) - goto error; - if (virJSONValueObjectCreateVArgs(&jargs, args) < 0) - goto error; + goto cleanup; - if (jargs && - virJSONValueObjectAppend(obj, wrap ? "data" : "arguments", jargs) < 0) - goto error; + obj = qemuMonitorJSONMakeCommandInternal(cmdname, jargs, transaction); + cleanup: va_end(args); return obj; - - error: - virJSONValueFree(obj); - virJSONValueFree(jargs); - va_end(args); - return NULL; } #define qemuMonitorJSONMakeCommand(cmdname, ...) \ -- 2.16.2

drive-mirror allows only file targets. Introduce support for blockdev-mirror that is able to copy to any BDS described by a node name in qemu. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_monitor.c | 22 ++++++++++++++++++++++ src/qemu/qemu_monitor.h | 9 +++++++++ src/qemu/qemu_monitor_json.c | 39 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 9 +++++++++ 4 files changed, 79 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index fb9583e405..315bb460b9 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3362,6 +3362,28 @@ qemuMonitorDriveMirror(qemuMonitorPtr mon, } +int +qemuMonitorBlockdevMirror(qemuMonitorPtr mon, + const char *jobname, + const char *device, + const char *target, + unsigned long long bandwidth, + unsigned int granularity, + unsigned long long buf_size, + unsigned int flags) +{ + VIR_DEBUG("jobname=%s, device=%s, target=%s, bandwidth=%lld, " + "granularity=%#x, buf_size=%lld, flags=0x%x", + NULLSTR(jobname), device, target, bandwidth, granularity, + buf_size, flags); + + QEMU_CHECK_MONITOR_JSON(mon); + + return qemuMonitorJSONBlockdevMirror(mon, jobname, device, target, bandwidth, + granularity, buf_size, flags); +} + + /* Use the transaction QMP command to run atomic snapshot commands. */ int qemuMonitorTransaction(qemuMonitorPtr mon, virJSONValuePtr *actions) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 52ad843029..6acc4edffa 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -860,6 +860,15 @@ int qemuMonitorDriveMirror(qemuMonitorPtr mon, unsigned long long buf_size, unsigned int flags) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); +int qemuMonitorBlockdevMirror(qemuMonitorPtr mon, + const char *jobname, + const char *device, + const char *target, + unsigned long long bandwidth, + unsigned int granularity, + unsigned long long buf_size, + unsigned int flags) + ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); int qemuMonitorDrivePivot(qemuMonitorPtr mon, const char *device) ATTRIBUTE_NONNULL(2); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 61554a7ebc..2a7abf538e 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4189,6 +4189,45 @@ qemuMonitorJSONDriveMirror(qemuMonitorPtr mon, return ret; } + +int +qemuMonitorJSONBlockdevMirror(qemuMonitorPtr mon, + const char *jobname, + const char *device, + const char *target, + unsigned long long speed, + unsigned int granularity, + unsigned long long buf_size, + unsigned int flags) +{ + int ret = -1; + virJSONValuePtr cmd; + virJSONValuePtr reply = NULL; + bool shallow = (flags & VIR_DOMAIN_BLOCK_REBASE_SHALLOW) != 0; + + cmd = qemuMonitorJSONMakeCommand("blockdev-mirror", + "S:job-id", jobname, + "s:device", device, + "s:target", target, + "Y:speed", speed, + "z:granularity", granularity, + "P:buf-size", buf_size, + "s:sync", shallow ? "top" : "full", + NULL); + if (!cmd) + return -1; + + if ((ret = qemuMonitorJSONCommand(mon, cmd, &reply)) < 0) + goto cleanup; + ret = qemuMonitorJSONCheckError(cmd, reply); + + cleanup: + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; +} + + int qemuMonitorJSONTransaction(qemuMonitorPtr mon, virJSONValuePtr *actions) { diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 22bcc1e8ef..646cfcc8ac 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -264,6 +264,15 @@ int qemuMonitorJSONDriveMirror(qemuMonitorPtr mon, unsigned long long buf_size, unsigned int flags) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); +int qemuMonitorJSONBlockdevMirror(qemuMonitorPtr mon, + const char *jobname, + const char *device, + const char *target, + unsigned long long speed, + unsigned int granularity, + unsigned long long buf_size, + unsigned int flags) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); int qemuMonitorJSONDrivePivot(qemuMonitorPtr mon, const char *device) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -- 2.16.2

We will be adding source data to it so extract it to a separate function. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_domain.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d3beee5d87..0bca80f3c6 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2067,6 +2067,23 @@ qemuDomainObjPrivateXMLFormatPR(virBufferPtr buf, } +static void +qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPtr buf, + virDomainObjPtr vm) +{ + size_t i; + virDomainDiskDefPtr disk; + qemuDomainDiskPrivatePtr diskPriv; + + for (i = 0; i < vm->def->ndisks; i++) { + disk = vm->def->disks[i]; + diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); + virBufferAsprintf(buf, "<disk dev='%s' migrating='%s'/>\n", + disk->dst, diskPriv->migrating ? "yes" : "no"); + } +} + + static int qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, virDomainObjPtr vm, @@ -2098,18 +2115,8 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, if (priv->job.asyncJob != QEMU_ASYNC_JOB_NONE) virBufferAsprintf(&attrBuf, " flags='0x%lx'", priv->job.apiFlags); - if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT) { - size_t i; - virDomainDiskDefPtr disk; - qemuDomainDiskPrivatePtr diskPriv; - - for (i = 0; i < vm->def->ndisks; i++) { - disk = vm->def->disks[i]; - diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); - virBufferAsprintf(&childBuf, "<disk dev='%s' migrating='%s'/>\n", - disk->dst, diskPriv->migrating ? "yes" : "no"); - } - } + if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT) + qemuDomainObjPrivateXMLFormatNBDMigration(&childBuf, vm); if (priv->job.migParams) qemuMigrationParamsFormat(&childBuf, priv->job.migParams); -- 2.16.2

On 05/18/2018 07:29 AM, Peter Krempa wrote: NIT: This one's unnecessary since its done at cleanup anyway. John

On 05/18/2018 07:29 AM, Peter Krempa wrote: [...] So I assume the lack of FreeAndReset was existing prior to this patch since d8be0f4bc? [...] John

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- .../migration-out-nbd-tls-in.xml | 464 +++++++++++++++++++++ .../migration-out-nbd-tls-out.xml | 1 + tests/qemuxml2xmltest.c | 1 + 3 files changed, 466 insertions(+) create mode 100644 tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml create mode 120000 tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml new file mode 100644 index 0000000000..be1dc7347e --- /dev/null +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml @@ -0,0 +1,464 @@ +<domstatus state='running' reason='booted' pid='68472'> + <taint flag='high-privileges'/> + <monitor path='/var/lib/libvirt/qemu/domain-3-upstream/monitor.sock' json='1' type='unix'/> + <namespaces> + <mount/> + </namespaces> + <vcpus> + <vcpu id='0' pid='68477'/> + <vcpu id='1' pid='68478'/> + </vcpus> + <qemuCaps> + <flag name='kvm'/> + <flag name='mem-path'/> + <flag name='drive-serial'/> + <flag name='monitor-json'/> + <flag name='sdl'/> + <flag name='netdev'/> + <flag name='rtc'/> + <flag name='vhost-net'/> + <flag name='no-hpet'/> + <flag name='no-kvm-pit'/> + <flag name='nodefconfig'/> + <flag name='boot-menu'/> + <flag name='fsdev'/> + <flag name='name-process'/> + <flag name='smbios-type'/> + <flag name='spice'/> + <flag name='vga-none'/> + <flag name='boot-index'/> + <flag name='hda-duplex'/> + <flag name='drive-aio'/> + <flag name='ccid-emulated'/> + <flag name='ccid-passthru'/> + <flag name='chardev-spicevmc'/> + <flag name='virtio-tx-alg'/> + <flag name='pci-multifunction'/> + <flag name='virtio-blk-pci.ioeventfd'/> + <flag name='sga'/> + <flag name='virtio-blk-pci.event_idx'/> + <flag name='virtio-net-pci.event_idx'/> + <flag name='cache-directsync'/> + <flag name='piix3-usb-uhci'/> + <flag name='piix4-usb-uhci'/> + <flag name='usb-ehci'/> + <flag name='ich9-usb-ehci1'/> + <flag name='vt82c686b-usb-uhci'/> + <flag name='pci-ohci'/> + <flag name='usb-redir'/> + <flag name='usb-hub'/> + <flag name='no-shutdown'/> + <flag name='cache-unsafe'/> + <flag name='ich9-ahci'/> + <flag name='no-acpi'/> + <flag name='fsdev-readonly'/> + <flag name='virtio-blk-pci.scsi'/> + <flag name='drive-copy-on-read'/> + <flag name='fsdev-writeout'/> + <flag name='drive-iotune'/> + <flag name='system_wakeup'/> + <flag name='scsi-disk.channel'/> + <flag name='scsi-block'/> + <flag name='transaction'/> + <flag name='block-job-async'/> + <flag name='scsi-cd'/> + <flag name='ide-cd'/> + <flag name='no-user-config'/> + <flag name='hda-micro'/> + <flag name='dump-guest-memory'/> + <flag name='nec-usb-xhci'/> + <flag name='balloon-event'/> + <flag name='bridge'/> + <flag name='lsi'/> + <flag name='virtio-scsi-pci'/> + <flag name='blockio'/> + <flag name='disable-s3'/> + <flag name='disable-s4'/> + <flag name='usb-redir.filter'/> + <flag name='ide-drive.wwn'/> + <flag name='scsi-disk.wwn'/> + <flag name='seccomp-sandbox'/> + <flag name='reboot-timeout'/> + <flag name='dump-guest-core'/> + <flag name='seamless-migration'/> + <flag name='block-commit'/> + <flag name='vnc'/> + <flag name='drive-mirror'/> + <flag name='usb-redir.bootindex'/> + <flag name='usb-host.bootindex'/> + <flag name='blockdev-snapshot-sync'/> + <flag name='qxl'/> + <flag name='VGA'/> + <flag name='cirrus-vga'/> + <flag name='vmware-svga'/> + <flag name='device-video-primary'/> + <flag name='usb-serial'/> + <flag name='usb-net'/> + <flag name='add-fd'/> + <flag name='nbd-server'/> + <flag name='virtio-rng'/> + <flag name='rng-random'/> + <flag name='rng-egd'/> + <flag name='dtb'/> + <flag name='megasas'/> + <flag name='ipv6-migration'/> + <flag name='machine-opt'/> + <flag name='machine-usb-opt'/> + <flag name='tpm-passthrough'/> + <flag name='tpm-tis'/> + <flag name='pci-bridge'/> + <flag name='vfio-pci'/> + <flag name='vfio-pci.bootindex'/> + <flag name='scsi-generic'/> + <flag name='scsi-generic.bootindex'/> + <flag name='mem-merge'/> + <flag name='vnc-websocket'/> + <flag name='drive-discard'/> + <flag name='mlock'/> + <flag name='vnc-share-policy'/> + <flag name='device-del-event'/> + <flag name='dmi-to-pci-bridge'/> + <flag name='i440fx-pci-hole64-size'/> + <flag name='q35-pci-hole64-size'/> + <flag name='usb-storage'/> + <flag name='usb-storage.removable'/> + <flag name='virtio-mmio'/> + <flag name='ich9-intel-hda'/> + <flag name='kvm-pit-lost-tick-policy'/> + <flag name='boot-strict'/> + <flag name='pvpanic'/> + <flag name='spice-file-xfer-disable'/> + <flag name='spiceport'/> + <flag name='usb-kbd'/> + <flag name='host-pci-multidomain'/> + <flag name='msg-timestamp'/> + <flag name='active-commit'/> + <flag name='change-backing-file'/> + <flag name='memory-backend-ram'/> + <flag name='numa'/> + <flag name='memory-backend-file'/> + <flag name='usb-audio'/> + <flag name='rtc-reset-reinjection'/> + <flag name='splash-timeout'/> + <flag name='iothread'/> + <flag name='migrate-rdma'/> + <flag name='ivshmem'/> + <flag name='drive-iotune-max'/> + <flag name='VGA.vgamem_mb'/> + <flag name='vmware-svga.vgamem_mb'/> + <flag name='qxl.vgamem_mb'/> + <flag name='pc-dimm'/> + <flag name='machine-vmport-opt'/> + <flag name='aes-key-wrap'/> + <flag name='dea-key-wrap'/> + <flag name='pci-serial'/> + <flag name='vhost-user-multiqueue'/> + <flag name='migration-event'/> + <flag name='ioh3420'/> + <flag name='x3130-upstream'/> + <flag name='xio3130-downstream'/> + <flag name='rtl8139'/> + <flag name='e1000'/> + <flag name='virtio-net'/> + <flag name='gic-version'/> + <flag name='incoming-defer'/> + <flag name='virtio-gpu'/> + <flag name='virtio-gpu.virgl'/> + <flag name='virtio-keyboard'/> + <flag name='virtio-mouse'/> + <flag name='virtio-tablet'/> + <flag name='virtio-input-host'/> + <flag name='chardev-file-append'/> + <flag name='ich9-disable-s3'/> + <flag name='ich9-disable-s4'/> + <flag name='vserport-change-event'/> + <flag name='virtio-balloon-pci.deflate-on-oom'/> + <flag name='mptsas1068'/> + <flag name='qxl.vram64_size_mb'/> + <flag name='chardev-logfile'/> + <flag name='debug-threads'/> + <flag name='secret'/> + <flag name='pxb'/> + <flag name='pxb-pcie'/> + <flag name='device-tray-moved-event'/> + <flag name='nec-usb-xhci-ports'/> + <flag name='virtio-scsi-pci.iothread'/> + <flag name='name-guest'/> + <flag name='qxl.max_outputs'/> + <flag name='spice-unix'/> + <flag name='drive-detect-zeroes'/> + <flag name='tls-creds-x509'/> + <flag name='display'/> + <flag name='intel-iommu'/> + <flag name='smm'/> + <flag name='virtio-pci-disable-legacy'/> + <flag name='query-hotpluggable-cpus'/> + <flag name='virtio-net.rx_queue_size'/> + <flag name='virtio-vga'/> + <flag name='drive-iotune-max-length'/> + <flag name='ivshmem-plain'/> + <flag name='ivshmem-doorbell'/> + <flag name='query-qmp-schema'/> + <flag name='gluster.debug_level'/> + <flag name='vhost-scsi'/> + <flag name='drive-iotune-group'/> + <flag name='query-cpu-model-expansion'/> + <flag name='virtio-net.host_mtu'/> + <flag name='nvdimm'/> + <flag name='pcie-root-port'/> + <flag name='query-cpu-definitions'/> + <flag name='block-write-threshold'/> + <flag name='query-named-block-nodes'/> + <flag name='cpu-cache'/> + <flag name='qemu-xhci'/> + <flag name='kernel-irqchip'/> + <flag name='kernel-irqchip.split'/> + <flag name='intel-iommu.intremap'/> + <flag name='intel-iommu.caching-mode'/> + <flag name='intel-iommu.eim'/> + <flag name='intel-iommu.device-iotlb'/> + <flag name='virtio.iommu_platform'/> + <flag name='virtio.ats'/> + <flag name='loadparm'/> + <flag name='vnc-multi-servers'/> + <flag name='virtio-net.tx_queue_size'/> + <flag name='chardev-reconnect'/> + <flag name='virtio-gpu.max_outputs'/> + <flag name='vxhs'/> + <flag name='virtio-blk.num-queues'/> + <flag name='vmcoreinfo'/> + <flag name='numa.dist'/> + <flag name='disk-share-rw'/> + <flag name='iscsi.password-secret'/> + <flag name='isa-serial'/> + <flag name='dump-completed'/> + <flag name='nbd-tls'/> + <flag name='blockdev-del'/> + </qemuCaps> + <job type='none' async='migration out' phase='perform3' flags='0x0'> + <disk dev='vdb' migrating='yes'> + <migrationSource type='network' format='raw' protocol='nbd' name='drive-virtio-disk1' tlsFromConfig='0'> + <host name='andariel.usersys.redhat.com' port='49152'/> + <privateData> + <nodenames> + <nodename type='storage' name='migration-vdb-storage'/> + <nodename type='format' name='migration-vdb-format'/> + </nodenames> + </privateData> + </migrationSource> + </disk> + <disk dev='hda' migrating='no'/> + </job> + <devices> + <device alias='rng0'/> + <device alias='sound0-codec0'/> + <device alias='virtio-disk1'/> + <device alias='virtio-serial0'/> + <device alias='video0'/> + <device alias='serial0'/> + <device alias='sound0'/> + <device alias='balloon0'/> + <device alias='channel1'/> + <device alias='channel0'/> + <device alias='net0'/> + <device alias='input0'/> + <device alias='redir0'/> + <device alias='redir1'/> + <device alias='scsi0'/> + <device alias='usb'/> + <device alias='ide0-0-0'/> + </devices> + <numad nodeset='0' cpuset='0-7'/> + <libDir path='/var/lib/libvirt/qemu/domain-3-upstream'/> + <channelTargetDir path='/var/lib/libvirt/qemu/channel/target/domain-3-upstream'/> + <chardevStdioLogd/> + <allowReboot value='yes'/> + <blockjobs active='no'/> + <domain type='kvm' id='3'> + <name>upstream</name> + <uuid>dcf47dbd-46d1-4d5b-b442-262a806a333a</uuid> + <memory unit='KiB'>1024000</memory> + <currentMemory unit='KiB'>1024000</currentMemory> + <memoryBacking> + <access mode='shared'/> + </memoryBacking> + <vcpu placement='auto' current='2'>8</vcpu> + <numatune> + <memory mode='strict' placement='auto'/> + </numatune> + <resource> + <partition>/machine</partition> + </resource> + <os> + <type arch='x86_64' machine='pc-i440fx-2.9'>hvm</type> + <bootmenu enable='yes'/> + </os> + <features> + <acpi/> + <apic/> + <vmport state='off'/> + </features> + <cpu> + <numa> + <cell id='0' cpus='0,2,4,6' memory='512000' unit='KiB'/> + <cell id='1' cpus='1,3,5,7' memory='512000' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'> + <timer name='rtc' tickpolicy='catchup'/> + <timer name='pit' tickpolicy='delay'/> + <timer name='hpet' present='no'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <pm> + <suspend-to-mem enabled='no'/> + <suspend-to-disk enabled='no'/> + </pm> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2' discard='unmap' detect_zeroes='on'/> + <source file='/var/lib/libvirt/images/a.qcow2'/> + <backingStore type='file' index='1'> + <format type='qcow2'/> + <source file='/var/lib/libvirt/images/base.qcow2'> + <privateData> + <relPath>base.qcow2</relPath> + </privateData> + </source> + <backingStore/> + </backingStore> + <target dev='vdb' bus='virtio'/> + <alias name='virtio-disk1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/systemrescuecd-x86-4.9.5.iso'/> + <backingStore/> + <target dev='hda' bus='ide'/> + <readonly/> + <boot order='1'/> + <alias name='ide0-0-0'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0' model='ich9-ehci1'> + <alias name='usb'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci1'> + <alias name='usb'/> + <master startport='0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0' multifunction='on'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci2'> + <alias name='usb'/> + <master startport='2'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x1'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci3'> + <alias name='usb'/> + <master startport='4'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'> + <alias name='pci.0'/> + </controller> + <controller type='virtio-serial' index='0'> + <alias name='virtio-serial0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </controller> + <controller type='ide' index='0'> + <alias name='ide'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='scsi' index='0' model='lsilogic'> + <alias name='scsi0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> + </controller> + <controller type='fdc' index='0'> + <alias name='fdc0'/> + </controller> + <interface type='network'> + <mac address='52:54:00:36:bd:3b'/> + <source network='default'/> + <actual type='network'> + <source bridge='virbr0'/> + </actual> + <target dev='vnet0'/> + <model type='virtio'/> + <alias name='net0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <serial type='pty'> + <source path='/dev/pts/67'/> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + <alias name='serial0'/> + </serial> + <console type='pty' tty='/dev/pts/67'> + <source path='/dev/pts/67'/> + <target type='serial' port='0'/> + <alias name='serial0'/> + </console> + <channel type='unix'> + <source mode='bind' path='/var/lib/libvirt/qemu/channel/target/domain-3-upstream/org.qemu.guest_agent.0'/> + <target type='virtio' name='org.qemu.guest_agent.0' state='disconnected'/> + <alias name='channel0'/> + <address type='virtio-serial' controller='0' bus='0' port='1'/> + </channel> + <channel type='spicevmc'> + <target type='virtio' name='com.redhat.spice.0' state='disconnected'/> + <alias name='channel1'/> + <address type='virtio-serial' controller='0' bus='0' port='2'/> + </channel> + <input type='tablet' bus='usb'> + <alias name='input0'/> + <address type='usb' bus='0' port='1'/> + </input> + <input type='mouse' bus='ps2'> + <alias name='input1'/> + </input> + <input type='keyboard' bus='ps2'> + <alias name='input2'/> + </input> + <graphics type='spice' port='5900' autoport='yes' listen='127.0.0.1'> + <listen type='address' address='127.0.0.1' fromConfig='1' autoGenerated='no'/> + <image compression='off'/> + </graphics> + <sound model='ich6'> + <alias name='sound0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </sound> + <video> + <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/> + <alias name='video0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <redirdev bus='usb' type='spicevmc'> + <alias name='redir0'/> + <address type='usb' bus='0' port='2'/> + </redirdev> + <redirdev bus='usb' type='spicevmc'> + <alias name='redir1'/> + <address type='usb' bus='0' port='3'/> + </redirdev> + <memballoon model='virtio'> + <alias name='balloon0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> + </memballoon> + <rng model='virtio'> + <backend model='random'>/dev/random</backend> + <alias name='rng0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </rng> + </devices> + <seclabel type='dynamic' model='dac' relabel='yes'> + <label>+0:+0</label> + <imagelabel>+0:+0</imagelabel> + </seclabel> + </domain> +</domstatus> diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml new file mode 120000 index 0000000000..e8cdbdb55e --- /dev/null +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml @@ -0,0 +1 @@ +migration-out-nbd-tls-in.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 7cedc2b999..e31d8212fe 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1208,6 +1208,7 @@ mymain(void) DO_TEST_STATUS("migration-out-nbd"); DO_TEST_STATUS("migration-in-params"); DO_TEST_STATUS("migration-out-params"); + DO_TEST_STATUS("migration-out-nbd-tls"); if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) virFileDeleteTree(fakerootdir); -- 2.16.2

Separate the code relevant for this approach so that we can later add a second implementation without making the function messy. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_migration.c | 76 ++++++++++++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index fdf71b2c0b..6617b7aea6 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -748,6 +748,48 @@ qemuMigrationSrcNBDCopyCancel(virQEMUDriverPtr driver, } +static int +qemuMigrationSrcNBDStorageCopyDriveMirror(virQEMUDriverPtr driver, + virDomainObjPtr vm, + const char *diskAlias, + const char *host, + int port, + unsigned long long mirror_speed, + unsigned int mirror_flags) +{ + char *nbd_dest = NULL; + int mon_ret; + int ret = -1; + + if (strchr(host, ':')) { + if (virAsprintf(&nbd_dest, "nbd:[%s]:%d:exportname=%s", + host, port, diskAlias) < 0) + goto cleanup; + } else { + if (virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=%s", + host, port, diskAlias) < 0) + goto cleanup; + } + + if (qemuDomainObjEnterMonitorAsync(driver, vm, + QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) + goto cleanup; + + mon_ret = qemuMonitorDriveMirror(qemuDomainGetMonitor(vm), + diskAlias, nbd_dest, "raw", + mirror_speed, 0, 0, mirror_flags); + + if (qemuDomainObjExitMonitor(driver, vm) < 0 || mon_ret < 0) + goto cleanup; + + ret = 0; + + cleanup: + VIR_FREE(nbd_dest); + return ret; +} + + /** * qemuMigrationSrcNBDStorageCopy: * @driver: qemu driver @@ -783,8 +825,6 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driver, int port; size_t i; char *diskAlias = NULL; - char *nbd_dest = NULL; - char *hoststr = NULL; unsigned long long mirror_speed = speed; unsigned int mirror_flags = VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT; int rv; @@ -804,47 +844,31 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driver, port = mig->nbd->port; mig->nbd->port = 0; - /* escape literal IPv6 address */ - if (strchr(host, ':')) { - if (virAsprintf(&hoststr, "[%s]", host) < 0) - goto cleanup; - } else if (VIR_STRDUP(hoststr, host) < 0) { - goto cleanup; - } - if (*migrate_flags & QEMU_MONITOR_MIGRATE_NON_SHARED_INC) mirror_flags |= VIR_DOMAIN_BLOCK_REBASE_SHALLOW; for (i = 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk = vm->def->disks[i]; qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); - int mon_ret; /* check whether disk should be migrated */ if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks)) continue; - if (!(diskAlias = qemuAliasFromDisk(disk)) || - (virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=%s", - hoststr, port, diskAlias) < 0)) + if (!(diskAlias = qemuAliasFromDisk(disk))) goto cleanup; qemuBlockJobSyncBegin(disk); - if (qemuDomainObjEnterMonitorAsync(driver, vm, - QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) - goto cleanup; - - /* Force "raw" format for NBD export */ - mon_ret = qemuMonitorDriveMirror(priv->mon, diskAlias, nbd_dest, - "raw", mirror_speed, 0, 0, mirror_flags); - VIR_FREE(diskAlias); - VIR_FREE(nbd_dest); - - if (qemuDomainObjExitMonitor(driver, vm) < 0 || mon_ret < 0) { + if (qemuMigrationSrcNBDStorageCopyDriveMirror(driver, vm, diskAlias, + host, port, + mirror_speed, + mirror_flags) < 0) { qemuBlockJobSyncEnd(vm, QEMU_ASYNC_JOB_MIGRATION_OUT, disk); goto cleanup; } + + VIR_FREE(diskAlias); diskPriv->migrating = true; if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { @@ -886,8 +910,6 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driver, cleanup: virObjectUnref(cfg); VIR_FREE(diskAlias); - VIR_FREE(nbd_dest); - VIR_FREE(hoststr); return ret; } -- 2.16.2