From nobody Mon Feb 9 10:50:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) client-ip=216.205.24.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584987163; cv=none; d=zohomail.com; s=zohoarc; b=il3cqruTjWhBmlEFwl+L6yClAI5TVWSjMLVPikmEWNInLJlNo2R7uNReVp6fecIjiq3Bs4lrg3SBkTm+rPRQP0ZLfc6LUvhosKABXIOKRtB00uRjfsHxXd8rrst3G43aZMCSRqTDenqFVxI/bJIvk3l2uI7Q+folQgRSZMJgPoI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584987163; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0P22BpRHbBkelj8qmwDgQv9h0OZ1SrwyyDJj9mmud+c=; b=iVYfGk5Wo06MWXp8CBVn7px9syKRkocHx8tzsCCJdYk480FpXkKV1wG4Z9xmIXHvejzmDkCR1VWKpWOTNVopUU5HvcV0gXZ3gnwqZfL7IgfmAr8iSatl3+oDkJaSVBuE45RQGadOGUX2ls/GqkIiRcST80odKibd/4uUhfpS32A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by mx.zohomail.com with SMTPS id 1584987163369552.337066229496; Mon, 23 Mar 2020 11:12:43 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-341-E7E16F7PNAi0-Lcj4hZZVQ-1; Mon, 23 Mar 2020 14:12:39 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6F1D2477; Mon, 23 Mar 2020 18:12:32 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3ABD15DA84; Mon, 23 Mar 2020 18:12:32 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E2AF1180880D; Mon, 23 Mar 2020 18:12:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02NICFwZ009489 for ; Mon, 23 Mar 2020 14:12:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id E4A7491290; Mon, 23 Mar 2020 18:12:15 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1CF9A8D574 for ; Mon, 23 Mar 2020 18:12:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584987162; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0P22BpRHbBkelj8qmwDgQv9h0OZ1SrwyyDJj9mmud+c=; b=fWFu94qB2Y0mDxZRTRPFFEUP9ziumUWMVipJ7Lt0dUT2Dq2Jv7ziOjAS1Ck2SRs0CKXZAt sRh7IVVNAFzacPavb/OvUuwwHDvMvXpNuuJcZyRQ+EfLgYagdqvlvuz0EBCvbw7O/ctkwA OyM4wzErJei67SmVHs698OoaSso6SOU= X-MC-Unique: E7E16F7PNAi0-Lcj4hZZVQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/14] qemublocktest: Test backing store strings Date: Mon, 23 Mar 2020 19:11:58 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" With -blockdev libvirt provides the string which is recorded as 'backing store' property of an image to qemu. Add testing for qemuBlockGetBackingStoreString which generates these strings as there's logic which determines which format to use. Signed-off-by: Peter Krempa --- tests/qemublocktest.c | 20 ++- .../xml2json/block-raw-noopts-srconly.json | 13 +- .../block-raw-reservations-srconly.json | 13 +- .../xml2json/dir-fat-cache-srconly.json | 15 +- .../xml2json/dir-fat-floppy-srconly.json | 15 +- .../xml2json/dir-fat-readonly-srconly.json | 15 +- ...ile-backing_basic-aio_threads-srconly.json | 68 +++++---- ...acking_basic-cache-directsync-srconly.json | 68 +++++---- ...file-backing_basic-cache-none-srconly.json | 68 +++++---- ...le-backing_basic-cache-unsafe-srconly.json | 68 +++++---- ...backing_basic-cache-writeback-srconly.json | 68 +++++---- ...king_basic-cache-writethrough-srconly.json | 68 +++++---- .../file-backing_basic-detect-srconly.json | 68 +++++---- .../file-backing_basic-noopts-srconly.json | 52 ++++--- ...le-backing_basic-unmap-detect-srconly.json | 68 +++++---- ...le-backing_basic-unmap-ignore-srconly.json | 68 +++++---- .../file-backing_basic-unmap-srconly.json | 68 +++++---- .../xml2json/file-bochs-noopts-srconly.json | 13 +- .../xml2json/file-cloop-noopts-srconly.json | 13 +- .../xml2json/file-dmg-noopts-srconly.json | 13 +- .../xml2json/file-ploop-noopts-srconly.json | 13 +- ...cow2-backing-chain-encryption-srconly.json | 26 ++-- ...le-qcow2-backing-chain-noopts-srconly.json | 130 ++++++++++++------ ...w2-backing-chain-unterminated-srconly.json | 26 ++-- .../xml2json/file-raw-aio_native-srconly.json | 13 +- .../xml2json/file-raw-luks-srconly.json | 13 +- .../xml2json/file-raw-noopts-srconly.json | 13 +- .../xml2json/file-vdi-noopts-srconly.json | 13 +- .../xml2json/file-vhd-noopts-srconly.json | 13 +- .../xml2json/file-vpc-noopts-srconly.json | 13 +- .../xml2json/network-nbd-tls-srconly.json | 19 ++- ...w2-backing-chain-cache-unsafe-srconly.json | 68 ++++++--- ...backing-chain-encryption_auth-srconly.json | 68 ++++++--- .../xml2json/nvme-raw-noopts-srconly.json | 19 ++- 34 files changed, 876 insertions(+), 433 deletions(-) diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 47d08333f7..709d94fd80 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -184,6 +184,7 @@ struct testQemuDiskXMLToJSONImageData { virJSONValuePtr formatprops; virJSONValuePtr storageprops; virJSONValuePtr storagepropssrc; + char *backingstore; }; @@ -210,6 +211,7 @@ testQemuDiskXMLToPropsClear(struct testQemuDiskXMLToJSO= NData *data) virJSONValueFree(data->images[i].formatprops); virJSONValueFree(data->images[i].storageprops); virJSONValueFree(data->images[i].storagepropssrc); + g_free(data->images[i].backingstore); } data->nimages =3D 0; VIR_FREE(data->images); @@ -287,6 +289,7 @@ testQemuDiskXMLToProps(const void *opaque) } for (n =3D disk->src; virStorageSourceIsBacking(n); n =3D n->backingSt= ore) { + g_autofree char *backingstore =3D NULL; if (testQemuDiskXMLToJSONFakeSecrets(n) < 0) return -1; @@ -298,7 +301,8 @@ testQemuDiskXMLToProps(const void *opaque) if (!(formatProps =3D qemuBlockStorageSourceGetBlockdevProps(n, n-= >backingStore)) || !(storageSrcOnlyProps =3D qemuBlockStorageSourceGetBackendProp= s(n, false, true, true)) || - !(storageProps =3D qemuBlockStorageSourceGetBackendProps(n, fa= lse, false, true))) { + !(storageProps =3D qemuBlockStorageSourceGetBackendProps(n, fa= lse, false, true)) || + !(backingstore =3D qemuBlockGetBackingStoreString(n, true))) { if (!data->fail) { VIR_TEST_VERBOSE("failed to generate qemu blockdev props"); return -1; @@ -314,6 +318,7 @@ testQemuDiskXMLToProps(const void *opaque) data->images[data->nimages].formatprops =3D g_steal_pointer(&forma= tProps); data->images[data->nimages].storageprops =3D g_steal_pointer(&stor= ageProps); data->images[data->nimages].storagepropssrc =3D g_steal_pointer(&s= torageSrcOnlyProps); + data->images[data->nimages].backingstore =3D g_steal_pointer(&back= ingstore); data->nimages++; } @@ -425,10 +430,21 @@ testQemuDiskXMLToPropsValidateFileSrcOnly(const void = *opaque) for (i =3D 0; i < data->nimages; i++) { g_autofree char *jsonstr =3D NULL; + virBufferAddLit(&buf, "(\n"); + virBufferAdjustIndent(&buf, 2); + virBufferAddLit(&buf, "source only properties:\n"); + if (!(jsonstr =3D virJSONValueToString(data->images[i].storageprop= ssrc, true))) return -1; - virBufferAdd(&buf, jsonstr, -1); + virBufferAddStr(&buf, jsonstr); + + virBufferAddLit(&buf, "backing store string:\n"); + virBufferAddStr(&buf, data->images[i].backingstore); + + virBufferTrim(&buf, "\n"); + virBufferAdjustIndent(&buf, -2); + virBufferAddLit(&buf, "\n)\n"); } actual =3D virBufferContentAndReset(&buf); diff --git a/tests/qemublocktestdata/xml2json/block-raw-noopts-srconly.json= b/tests/qemublocktestdata/xml2json/block-raw-noopts-srconly.json index 72f9067353..07f7390433 100644 --- a/tests/qemublocktestdata/xml2json/block-raw-noopts-srconly.json +++ b/tests/qemublocktestdata/xml2json/block-raw-noopts-srconly.json @@ -1,4 +1,9 @@ -{ - "driver": "host_device", - "filename": "/dev/blah" -} +( + source only properties: + { + "driver": "host_device", + "filename": "/dev/blah" + } + backing store string: + /dev/blah +) diff --git a/tests/qemublocktestdata/xml2json/block-raw-reservations-srconl= y.json b/tests/qemublocktestdata/xml2json/block-raw-reservations-srconly.js= on index 72f9067353..07f7390433 100644 --- a/tests/qemublocktestdata/xml2json/block-raw-reservations-srconly.json +++ b/tests/qemublocktestdata/xml2json/block-raw-reservations-srconly.json @@ -1,4 +1,9 @@ -{ - "driver": "host_device", - "filename": "/dev/blah" -} +( + source only properties: + { + "driver": "host_device", + "filename": "/dev/blah" + } + backing store string: + /dev/blah +) diff --git a/tests/qemublocktestdata/xml2json/dir-fat-cache-srconly.json b/= tests/qemublocktestdata/xml2json/dir-fat-cache-srconly.json index 6ec4f78d7b..8bc58fa033 100644 --- a/tests/qemublocktestdata/xml2json/dir-fat-cache-srconly.json +++ b/tests/qemublocktestdata/xml2json/dir-fat-cache-srconly.json @@ -1,5 +1,10 @@ -{ - "driver": "vvfat", - "dir": "/var/somefiles", - "floppy": false -} +( + source only properties: + { + "driver": "vvfat", + "dir": "/var/somefiles", + "floppy": false + } + backing store string: + /var/somefiles +) diff --git a/tests/qemublocktestdata/xml2json/dir-fat-floppy-srconly.json b= /tests/qemublocktestdata/xml2json/dir-fat-floppy-srconly.json index 6b0388bc18..043b796435 100644 --- a/tests/qemublocktestdata/xml2json/dir-fat-floppy-srconly.json +++ b/tests/qemublocktestdata/xml2json/dir-fat-floppy-srconly.json @@ -1,5 +1,10 @@ -{ - "driver": "vvfat", - "dir": "/var/somefiles", - "floppy": true -} +( + source only properties: + { + "driver": "vvfat", + "dir": "/var/somefiles", + "floppy": true + } + backing store string: + /var/somefiles +) diff --git a/tests/qemublocktestdata/xml2json/dir-fat-readonly-srconly.json= b/tests/qemublocktestdata/xml2json/dir-fat-readonly-srconly.json index 6ec4f78d7b..8bc58fa033 100644 --- a/tests/qemublocktestdata/xml2json/dir-fat-readonly-srconly.json +++ b/tests/qemublocktestdata/xml2json/dir-fat-readonly-srconly.json @@ -1,5 +1,10 @@ -{ - "driver": "vvfat", - "dir": "/var/somefiles", - "floppy": false -} +( + source only properties: + { + "driver": "vvfat", + "dir": "/var/somefiles", + "floppy": false + } + backing store string: + /var/somefiles +) diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_thread= s-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_th= reads-srconly.json index ea490b0034..65a3773b97 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads-srcon= ly.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads-srcon= ly.json @@ -1,24 +1,44 @@ -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/a" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/b" -} -{ - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/d" -} +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/a" + } + backing store string: + /var/lib/libvirt/images/a +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/b" + } + backing store string: + /var/lib/libvirt/images/b +) +( + source only properties: + { + "driver": "gluster", + "volume": "images", + "path": "c", + "server": [ + { + "type": "inet", + "host": "test.org", + "port": "24007" + } + ] + } + backing store string: + gluster://test.org:24007/images/c +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/d" + } + backing store string: + /var/lib/libvirt/images/d +) diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-dire= ctsync-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-c= ache-directsync-srconly.json index ea490b0034..65a3773b97 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync-= srconly.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync-= srconly.json @@ -1,24 +1,44 @@ -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/a" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/b" -} -{ - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/d" -} +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/a" + } + backing store string: + /var/lib/libvirt/images/a +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/b" + } + backing store string: + /var/lib/libvirt/images/b +) +( + source only properties: + { + "driver": "gluster", + "volume": "images", + "path": "c", + "server": [ + { + "type": "inet", + "host": "test.org", + "port": "24007" + } + ] + } + backing store string: + gluster://test.org:24007/images/c +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/d" + } + backing store string: + /var/lib/libvirt/images/d +) diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none= -srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-n= one-srconly.json index ea490b0034..65a3773b97 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none-srconl= y.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none-srconl= y.json @@ -1,24 +1,44 @@ -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/a" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/b" -} -{ - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/d" -} +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/a" + } + backing store string: + /var/lib/libvirt/images/a +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/b" + } + backing store string: + /var/lib/libvirt/images/b +) +( + source only properties: + { + "driver": "gluster", + "volume": "images", + "path": "c", + "server": [ + { + "type": "inet", + "host": "test.org", + "port": "24007" + } + ] + } + backing store string: + gluster://test.org:24007/images/c +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/d" + } + backing store string: + /var/lib/libvirt/images/d +) diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsa= fe-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache= -unsafe-srconly.json index ea490b0034..65a3773b97 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe-srco= nly.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe-srco= nly.json @@ -1,24 +1,44 @@ -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/a" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/b" -} -{ - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/d" -} +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/a" + } + backing store string: + /var/lib/libvirt/images/a +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/b" + } + backing store string: + /var/lib/libvirt/images/b +) +( + source only properties: + { + "driver": "gluster", + "volume": "images", + "path": "c", + "server": [ + { + "type": "inet", + "host": "test.org", + "port": "24007" + } + ] + } + backing store string: + gluster://test.org:24007/images/c +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/d" + } + backing store string: + /var/lib/libvirt/images/d +) diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writ= eback-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-ca= che-writeback-srconly.json index ea490b0034..65a3773b97 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback-s= rconly.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback-s= rconly.json @@ -1,24 +1,44 @@ -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/a" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/b" -} -{ - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/d" -} +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/a" + } + backing store string: + /var/lib/libvirt/images/a +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/b" + } + backing store string: + /var/lib/libvirt/images/b +) +( + source only properties: + { + "driver": "gluster", + "volume": "images", + "path": "c", + "server": [ + { + "type": "inet", + "host": "test.org", + "port": "24007" + } + ] + } + backing store string: + gluster://test.org:24007/images/c +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/d" + } + backing store string: + /var/lib/libvirt/images/d +) diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writ= ethrough-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic= -cache-writethrough-srconly.json index ea490b0034..65a3773b97 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethroug= h-srconly.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethroug= h-srconly.json @@ -1,24 +1,44 @@ -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/a" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/b" -} -{ - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/d" -} +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/a" + } + backing store string: + /var/lib/libvirt/images/a +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/b" + } + backing store string: + /var/lib/libvirt/images/b +) +( + source only properties: + { + "driver": "gluster", + "volume": "images", + "path": "c", + "server": [ + { + "type": "inet", + "host": "test.org", + "port": "24007" + } + ] + } + backing store string: + gluster://test.org:24007/images/c +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/d" + } + backing store string: + /var/lib/libvirt/images/d +) diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-detect-src= only.json b/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srco= nly.json index ea490b0034..65a3773b97 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srconly.js= on +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srconly.js= on @@ -1,24 +1,44 @@ -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/a" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/b" -} -{ - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/d" -} +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/a" + } + backing store string: + /var/lib/libvirt/images/a +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/b" + } + backing store string: + /var/lib/libvirt/images/b +) +( + source only properties: + { + "driver": "gluster", + "volume": "images", + "path": "c", + "server": [ + { + "type": "inet", + "host": "test.org", + "port": "24007" + } + ] + } + backing store string: + gluster://test.org:24007/images/c +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/d" + } + backing store string: + /var/lib/libvirt/images/d +) diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-noopts-src= only.json b/tests/qemublocktestdata/xml2json/file-backing_basic-noopts-srco= nly.json index dbdf6e563b..35a8c3af37 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-noopts-srconly.js= on +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-noopts-srconly.js= on @@ -1,16 +1,36 @@ -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/a" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/b" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/c" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/d" -} +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/a" + } + backing store string: + /var/lib/libvirt/images/a +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/b" + } + backing store string: + /var/lib/libvirt/images/b +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/c" + } + backing store string: + /var/lib/libvirt/images/c +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/d" + } + backing store string: + /var/lib/libvirt/images/d +) diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-dete= ct-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap= -detect-srconly.json index ea490b0034..65a3773b97 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect-srco= nly.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect-srco= nly.json @@ -1,24 +1,44 @@ -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/a" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/b" -} -{ - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/d" -} +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/a" + } + backing store string: + /var/lib/libvirt/images/a +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/b" + } + backing store string: + /var/lib/libvirt/images/b +) +( + source only properties: + { + "driver": "gluster", + "volume": "images", + "path": "c", + "server": [ + { + "type": "inet", + "host": "test.org", + "port": "24007" + } + ] + } + backing store string: + gluster://test.org:24007/images/c +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/d" + } + backing store string: + /var/lib/libvirt/images/d +) diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-igno= re-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap= -ignore-srconly.json index ea490b0034..65a3773b97 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore-srco= nly.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore-srco= nly.json @@ -1,24 +1,44 @@ -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/a" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/b" -} -{ - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/d" -} +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/a" + } + backing store string: + /var/lib/libvirt/images/a +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/b" + } + backing store string: + /var/lib/libvirt/images/b +) +( + source only properties: + { + "driver": "gluster", + "volume": "images", + "path": "c", + "server": [ + { + "type": "inet", + "host": "test.org", + "port": "24007" + } + ] + } + backing store string: + gluster://test.org:24007/images/c +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/d" + } + backing store string: + /var/lib/libvirt/images/d +) diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srco= nly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconl= y.json index ea490b0034..65a3773b97 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconly.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconly.json @@ -1,24 +1,44 @@ -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/a" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/b" -} -{ - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/d" -} +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/a" + } + backing store string: + /var/lib/libvirt/images/a +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/b" + } + backing store string: + /var/lib/libvirt/images/b +) +( + source only properties: + { + "driver": "gluster", + "volume": "images", + "path": "c", + "server": [ + { + "type": "inet", + "host": "test.org", + "port": "24007" + } + ] + } + backing store string: + gluster://test.org:24007/images/c +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/d" + } + backing store string: + /var/lib/libvirt/images/d +) diff --git a/tests/qemublocktestdata/xml2json/file-bochs-noopts-srconly.jso= n b/tests/qemublocktestdata/xml2json/file-bochs-noopts-srconly.json index c50fa903f5..58dd7e1c34 100644 --- a/tests/qemublocktestdata/xml2json/file-bochs-noopts-srconly.json +++ b/tests/qemublocktestdata/xml2json/file-bochs-noopts-srconly.json @@ -1,4 +1,9 @@ -{ - "driver": "file", - "filename": "/path/to/i.img" -} +( + source only properties: + { + "driver": "file", + "filename": "/path/to/i.img" + } + backing store string: + /path/to/i.img +) diff --git a/tests/qemublocktestdata/xml2json/file-cloop-noopts-srconly.jso= n b/tests/qemublocktestdata/xml2json/file-cloop-noopts-srconly.json index c50fa903f5..58dd7e1c34 100644 --- a/tests/qemublocktestdata/xml2json/file-cloop-noopts-srconly.json +++ b/tests/qemublocktestdata/xml2json/file-cloop-noopts-srconly.json @@ -1,4 +1,9 @@ -{ - "driver": "file", - "filename": "/path/to/i.img" -} +( + source only properties: + { + "driver": "file", + "filename": "/path/to/i.img" + } + backing store string: + /path/to/i.img +) diff --git a/tests/qemublocktestdata/xml2json/file-dmg-noopts-srconly.json = b/tests/qemublocktestdata/xml2json/file-dmg-noopts-srconly.json index c50fa903f5..58dd7e1c34 100644 --- a/tests/qemublocktestdata/xml2json/file-dmg-noopts-srconly.json +++ b/tests/qemublocktestdata/xml2json/file-dmg-noopts-srconly.json @@ -1,4 +1,9 @@ -{ - "driver": "file", - "filename": "/path/to/i.img" -} +( + source only properties: + { + "driver": "file", + "filename": "/path/to/i.img" + } + backing store string: + /path/to/i.img +) diff --git a/tests/qemublocktestdata/xml2json/file-ploop-noopts-srconly.jso= n b/tests/qemublocktestdata/xml2json/file-ploop-noopts-srconly.json index c50fa903f5..58dd7e1c34 100644 --- a/tests/qemublocktestdata/xml2json/file-ploop-noopts-srconly.json +++ b/tests/qemublocktestdata/xml2json/file-ploop-noopts-srconly.json @@ -1,4 +1,9 @@ -{ - "driver": "file", - "filename": "/path/to/i.img" -} +( + source only properties: + { + "driver": "file", + "filename": "/path/to/i.img" + } + backing store string: + /path/to/i.img +) diff --git a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encr= yption-srconly.json b/tests/qemublocktestdata/xml2json/file-qcow2-backing-c= hain-encryption-srconly.json index 316dbc9df2..29644f8c0f 100644 --- a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption-= srconly.json +++ b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption-= srconly.json @@ -1,8 +1,18 @@ -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/a" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/b" -} +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/a" + } + backing store string: + /var/lib/libvirt/images/a +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/b" + } + backing store string: + /var/lib/libvirt/images/b +) diff --git a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noop= ts-srconly.json b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain= -noopts-srconly.json index d998acc194..7691609577 100644 --- a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts-srco= nly.json +++ b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts-srco= nly.json @@ -1,40 +1,90 @@ -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1507297895" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1484071872" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1483615252" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1483605924" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1483605920" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1483546244" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1483545901" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1483545313" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1483536402" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.qcow2" -} +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1507297895" + } + backing store string: + /var/lib/libvirt/images/rhel7.3.1507297895 +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1484071872" + } + backing store string: + /var/lib/libvirt/images/rhel7.3.1484071872 +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1483615252" + } + backing store string: + /var/lib/libvirt/images/rhel7.3.1483615252 +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1483605924" + } + backing store string: + /var/lib/libvirt/images/rhel7.3.1483605924 +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1483605920" + } + backing store string: + /var/lib/libvirt/images/rhel7.3.1483605920 +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1483546244" + } + backing store string: + /var/lib/libvirt/images/rhel7.3.1483546244 +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1483545901" + } + backing store string: + /var/lib/libvirt/images/rhel7.3.1483545901 +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1483545313" + } + backing store string: + /var/lib/libvirt/images/rhel7.3.1483545313 +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1483536402" + } + backing store string: + /var/lib/libvirt/images/rhel7.3.1483536402 +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.qcow2" + } + backing store string: + /var/lib/libvirt/images/rhel7.3.qcow2 +) diff --git a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unte= rminated-srconly.json b/tests/qemublocktestdata/xml2json/file-qcow2-backing= -chain-unterminated-srconly.json index e0bce3bcd2..f2fd81184b 100644 --- a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminate= d-srconly.json +++ b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminate= d-srconly.json @@ -1,8 +1,18 @@ -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1507297895" -} -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/rhel7.3.1484071872" -} +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1507297895" + } + backing store string: + /var/lib/libvirt/images/rhel7.3.1507297895 +) +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/rhel7.3.1484071872" + } + backing store string: + /var/lib/libvirt/images/rhel7.3.1484071872 +) diff --git a/tests/qemublocktestdata/xml2json/file-raw-aio_native-srconly.j= son b/tests/qemublocktestdata/xml2json/file-raw-aio_native-srconly.json index c50fa903f5..58dd7e1c34 100644 --- a/tests/qemublocktestdata/xml2json/file-raw-aio_native-srconly.json +++ b/tests/qemublocktestdata/xml2json/file-raw-aio_native-srconly.json @@ -1,4 +1,9 @@ -{ - "driver": "file", - "filename": "/path/to/i.img" -} +( + source only properties: + { + "driver": "file", + "filename": "/path/to/i.img" + } + backing store string: + /path/to/i.img +) diff --git a/tests/qemublocktestdata/xml2json/file-raw-luks-srconly.json b/= tests/qemublocktestdata/xml2json/file-raw-luks-srconly.json index 6d7088211f..c065e3fab0 100644 --- a/tests/qemublocktestdata/xml2json/file-raw-luks-srconly.json +++ b/tests/qemublocktestdata/xml2json/file-raw-luks-srconly.json @@ -1,4 +1,9 @@ -{ - "driver": "file", - "filename": "/path/luks.img" -} +( + source only properties: + { + "driver": "file", + "filename": "/path/luks.img" + } + backing store string: + /path/luks.img +) diff --git a/tests/qemublocktestdata/xml2json/file-raw-noopts-srconly.json = b/tests/qemublocktestdata/xml2json/file-raw-noopts-srconly.json index bb3e8af9eb..a2b32b09e0 100644 --- a/tests/qemublocktestdata/xml2json/file-raw-noopts-srconly.json +++ b/tests/qemublocktestdata/xml2json/file-raw-noopts-srconly.json @@ -1,4 +1,9 @@ -{ - "driver": "file", - "filename": "/var/lib/libvirt/images/i.img" -} +( + source only properties: + { + "driver": "file", + "filename": "/var/lib/libvirt/images/i.img" + } + backing store string: + /var/lib/libvirt/images/i.img +) diff --git a/tests/qemublocktestdata/xml2json/file-vdi-noopts-srconly.json = b/tests/qemublocktestdata/xml2json/file-vdi-noopts-srconly.json index c50fa903f5..58dd7e1c34 100644 --- a/tests/qemublocktestdata/xml2json/file-vdi-noopts-srconly.json +++ b/tests/qemublocktestdata/xml2json/file-vdi-noopts-srconly.json @@ -1,4 +1,9 @@ -{ - "driver": "file", - "filename": "/path/to/i.img" -} +( + source only properties: + { + "driver": "file", + "filename": "/path/to/i.img" + } + backing store string: + /path/to/i.img +) diff --git a/tests/qemublocktestdata/xml2json/file-vhd-noopts-srconly.json = b/tests/qemublocktestdata/xml2json/file-vhd-noopts-srconly.json index c50fa903f5..58dd7e1c34 100644 --- a/tests/qemublocktestdata/xml2json/file-vhd-noopts-srconly.json +++ b/tests/qemublocktestdata/xml2json/file-vhd-noopts-srconly.json @@ -1,4 +1,9 @@ -{ - "driver": "file", - "filename": "/path/to/i.img" -} +( + source only properties: + { + "driver": "file", + "filename": "/path/to/i.img" + } + backing store string: + /path/to/i.img +) diff --git a/tests/qemublocktestdata/xml2json/file-vpc-noopts-srconly.json = b/tests/qemublocktestdata/xml2json/file-vpc-noopts-srconly.json index c50fa903f5..58dd7e1c34 100644 --- a/tests/qemublocktestdata/xml2json/file-vpc-noopts-srconly.json +++ b/tests/qemublocktestdata/xml2json/file-vpc-noopts-srconly.json @@ -1,4 +1,9 @@ -{ - "driver": "file", - "filename": "/path/to/i.img" -} +( + source only properties: + { + "driver": "file", + "filename": "/path/to/i.img" + } + backing store string: + /path/to/i.img +) diff --git a/tests/qemublocktestdata/xml2json/network-nbd-tls-srconly.json = b/tests/qemublocktestdata/xml2json/network-nbd-tls-srconly.json index 455f4e5140..606e68713a 100644 --- a/tests/qemublocktestdata/xml2json/network-nbd-tls-srconly.json +++ b/tests/qemublocktestdata/xml2json/network-nbd-tls-srconly.json @@ -1,8 +1,13 @@ -{ - "driver": "nbd", - "server": { - "type": "inet", - "host": "host1.example.com", - "port": "10809" +( + source only properties: + { + "driver": "nbd", + "server": { + "type": "inet", + "host": "host1.example.com", + "port": "10809" + } } -} + backing store string: + nbd://host1.example.com:10809 +) diff --git a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-c= ache-unsafe-srconly.json b/tests/qemublocktestdata/xml2json/network-qcow2-b= acking-chain-cache-unsafe-srconly.json index 69ca9caf88..2d7eeb3bca 100644 --- a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-un= safe-srconly.json +++ b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-un= safe-srconly.json @@ -1,22 +1,46 @@ -{ - "driver": "rbd", - "pool": "rbdpool", - "image": "rbdimg", - "server": [ - { - "host": "host1.example.com", - "port": "0" - }, - { - "host": "host2.example.com", - "port": "0" - } - ] -} -{ - "driver": "iscsi", - "portal": "example.org:3260", - "target": "iscsitarget", - "lun": 1, - "transport": "tcp" -} +( + source only properties: + { + "driver": "rbd", + "pool": "rbdpool", + "image": "rbdimg", + "server": [ + { + "host": "host1.example.com", + "port": "0" + }, + { + "host": "host2.example.com", + "port": "0" + } + ] + } + backing store string: + json:{ + "driver": "rbd", + "pool": "rbdpool", + "image": "rbdimg", + "server": [ + { + "host": "host1.example.com", + "port": "0" + }, + { + "host": "host2.example.com", + "port": "0" + } + ] + } +) +( + source only properties: + { + "driver": "iscsi", + "portal": "example.org:3260", + "target": "iscsitarget", + "lun": 1, + "transport": "tcp" + } + backing store string: + iscsi://example.org:3260/iscsitarget/1 +) diff --git a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-e= ncryption_auth-srconly.json b/tests/qemublocktestdata/xml2json/network-qcow= 2-backing-chain-encryption_auth-srconly.json index 6298329812..5679318fbe 100644 --- a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encrypti= on_auth-srconly.json +++ b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encrypti= on_auth-srconly.json @@ -1,22 +1,46 @@ -{ - "driver": "rbd", - "pool": "rbdpool", - "image": "rbdimg", - "server": [ - { - "host": "host1.example.com", - "port": "0" - }, - { - "host": "host2.example.com", - "port": "0" - } - ] -} -{ - "driver": "iscsi", - "portal": "example.org:3260", - "target": "iqn.2016-09.com.example:iscsitarget", - "lun": 1, - "transport": "tcp" -} +( + source only properties: + { + "driver": "rbd", + "pool": "rbdpool", + "image": "rbdimg", + "server": [ + { + "host": "host1.example.com", + "port": "0" + }, + { + "host": "host2.example.com", + "port": "0" + } + ] + } + backing store string: + json:{ + "driver": "rbd", + "pool": "rbdpool", + "image": "rbdimg", + "server": [ + { + "host": "host1.example.com", + "port": "0" + }, + { + "host": "host2.example.com", + "port": "0" + } + ] + } +) +( + source only properties: + { + "driver": "iscsi", + "portal": "example.org:3260", + "target": "iqn.2016-09.com.example:iscsitarget", + "lun": 1, + "transport": "tcp" + } + backing store string: + iscsi://example.org:3260/iqn.2016-09.com.example%3Aiscsitarget/1 +) diff --git a/tests/qemublocktestdata/xml2json/nvme-raw-noopts-srconly.json = b/tests/qemublocktestdata/xml2json/nvme-raw-noopts-srconly.json index ed55c08cbf..970e1bb8af 100644 --- a/tests/qemublocktestdata/xml2json/nvme-raw-noopts-srconly.json +++ b/tests/qemublocktestdata/xml2json/nvme-raw-noopts-srconly.json @@ -1,5 +1,14 @@ -{ - "driver": "nvme", - "device": "0000:01:00.0", - "namespace": 1 -} +( + source only properties: + { + "driver": "nvme", + "device": "0000:01:00.0", + "namespace": 1 + } + backing store string: + json:{ + "driver": "nvme", + "device": "0000:01:00.0", + "namespace": 1 + } +) --=20 2.24.1