From nobody Thu Nov 21 18:08:45 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates
 8.43.85.245 as permitted sender) client-ip=8.43.85.245;
 envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org;
Authentication-Results: mx.zohomail.com;
	dkim=fail;
	spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as
 permitted sender)  smtp.mailfrom=devel-bounces@lists.libvirt.org;
	dmarc=pass(p=reject dis=none)  header.from=lists.libvirt.org
ARC-Seal: i=1; a=rsa-sha256; t=1732119240; cv=none;
	d=zohomail.com; s=zohoarc;
	b=fdQFCxKLxASkULNvWztZInKfhLJNsfwUW3B8wW7qw3Gy+YJkEEBirS/4G8rr9pOxqeRRhWXXQIv5eq3yBPrtLBjHcr3m5uzX6xlXjOulIfoYV1hZixku+rF7RemGJal5Kv3JnkCHGOUJwjO7C3CJ9TDB8VpCx8vkaVcmddGGWjU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1732119240;
 h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id;
	bh=R17kxOatgE9uZ8TPyoka19b7e5modi3m52lvmemOntE=;
	b=fxQijgXO2Z8HsxdA4r4xa0gWZmoWS/ZGK0JErxFo9DDBpOgg8U/N/ELHxVGGOxhpNchDqVZFndWUJYidPd2xp5ZeW6X/mdj3vmeFMJKo0YJklqVPFaAoDRh71x4AxjnshUQ8q6YnL7VejcGGMAAjXObRS9sQgrbShQC/hPKcxhM=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=fail;
	spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as
 permitted sender)  smtp.mailfrom=devel-bounces@lists.libvirt.org;
	dmarc=pass header.from=<devel@lists.libvirt.org> (p=reject dis=none)
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 1732119240476206.87964556332497;
 Wed, 20 Nov 2024 08:14:00 -0800 (PST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 6A884A41; Wed, 20 Nov 2024 11:13:59 -0500 (EST)
Received: from lists.libvirt.org (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id 4F6471499;
	Wed, 20 Nov 2024 11:10:03 -0500 (EST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id E223A1526; Wed, 20 Nov 2024 11:09:55 -0500 (EST)
Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by lists.libvirt.org (Postfix) with ESMTPS id 06E7F154E
	for <devel@lists.libvirt.org>; Wed, 20 Nov 2024 11:09:42 -0500 (EST)
Received: from [130.117.225.1] (helo=vz9-barybin-2.ch-qa.vzint.dev)
	by relay.virtuozzo.com with esmtp (Exim 4.96)
	(envelope-from <nikolai.barybin@virtuozzo.com>)
	id 1tDn0z-0005yc-0V;
	Wed, 20 Nov 2024 16:53:13 +0100
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_RPBL_BLOCKED,
	RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable
	autolearn_force=no version=3.4.4
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
	d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From:
	Content-Type; bh=ewynCiEMNroPTYWXrTClsqDayBlLl7dj7WnLa1fIIo8=; b=I08W5+Ln6nGq
	tA7pImzsc0uL8A8HHeZSxuJjWO1m2DMeeqdC6gDvsimiiDiKDp6iWV+qKSVHfwmiuUvsRTX2XCQ26
	aqgukqtcmWfiiG+PcU6MSuV4ShegJNVGyS1P/np0nnfU44XsYXTjPGP4rkZDhEtcDwluJ9xczdygJ
	mb9x4zwgEbe1voEMASmiyGIqKLJkraQ0t5lZ/K+LxyBV75H3p4m9yWqP/4torkKtlFEDqjxWIfm3z
	GJmRgrqakSROAnUYRsl0QZgIiQzFB71hFk+FQYANvVKTw/hOZSbJ2BAUqsq7R+RwuPUM9hhQJkADi
	8FHmIqyr0lwZx0et2B27eg==;
To: devel@lists.libvirt.org
Subject: [PATCH 14/15] tests: add qcow2 data-file tests
Date: Wed, 20 Nov 2024 18:48:49 +0300
Message-ID: <20241120155229.1259-15-nikolai.barybin@virtuozzo.com>
X-Mailer: git-send-email 2.43.5
In-Reply-To: <20241120155229.1259-1-nikolai.barybin@virtuozzo.com>
References: <20241120155229.1259-1-nikolai.barybin@virtuozzo.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Message-ID-Hash: IDFESQZDZ7WGUQPPQQM67GBMAQZFW65V
X-Message-ID-Hash: IDFESQZDZ7WGUQPPQQM67GBMAQZFW65V
X-MailFrom: nikolai.barybin@virtuozzo.com
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency;
 loop; banned-address; member-moderation; header-match-config-1;
 header-match-config-2; header-match-config-3;
 header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia;
 implicit-dest; max-recipients; max-size; news-moderation; no-subject;
 suspicious-header
CC: den@openvz.org, Nikolai Barybin <nikolai.barybin@virtuozzo.com>
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/IDFESQZDZ7WGUQPPQQM67GBMAQZFW65V/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
From: Nikolai Barybin via Devel <devel@lists.libvirt.org>
Reply-To: Nikolai Barybin <nikolai.barybin@virtuozzo.com>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1732119240881116600
Content-Type: text/plain; charset="utf-8"

- qemuxmlconftest: check various xml definitions of dataFileStore:
types file, block, network and the case when data-file belongs
to qcow2 backing image

- virstoragetest: create qcow2 image chains and check that data files
are properly probed by metadata parser

- qemuxmlactivetest: check that status files will contain data files'
node names

Signed-off-by: Nikolai Barybin <nikolai.barybin@virtuozzo.com>
---
 .../qcow2-data-file-in.xml                    | 86 ++++++++++++++++
 .../qcow2-data-file-out.xml                   | 86 ++++++++++++++++
 tests/qemuxmlactivetest.c                     |  2 +
 ...sk-qcow2-datafile-store.x86_64-latest.args | 51 ++++++++++
 ...isk-qcow2-datafile-store.x86_64-latest.xml | 81 +++++++++++++++
 .../disk-qcow2-datafile-store.xml             | 67 +++++++++++++
 tests/qemuxmlconftest.c                       |  1 +
 tests/virstoragetest.c                        | 98 +++++++++++++++++++
 tests/virstoragetestdata/out/qcow2-data_file  | 20 ++++
 .../out/qcow2-qcow2_qcow2-qcow2-data_file     | 31 ++++++
 10 files changed, 523 insertions(+)
 create mode 100644 tests/qemustatusxml2xmldata/qcow2-data-file-in.xml
 create mode 100644 tests/qemustatusxml2xmldata/qcow2-data-file-out.xml
 create mode 100644 tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-=
latest.args
 create mode 100644 tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-=
latest.xml
 create mode 100644 tests/qemuxmlconfdata/disk-qcow2-datafile-store.xml
 create mode 100644 tests/virstoragetestdata/out/qcow2-data_file
 create mode 100644 tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2-da=
ta_file

diff --git a/tests/qemustatusxml2xmldata/qcow2-data-file-in.xml b/tests/qem=
ustatusxml2xmldata/qcow2-data-file-in.xml
new file mode 100644
index 0000000000..40479dd3d6
--- /dev/null
+++ b/tests/qemustatusxml2xmldata/qcow2-data-file-in.xml
@@ -0,0 +1,86 @@
+<domstatus state=3D'running' reason=3D'booted' pid=3D'3803518'>
+  <taint flag=3D'high-privileges'/>
+  <monitor path=3D'/var/lib/libvirt/qemu/test.monitor' type=3D'unix'/>
+  <vcpus>
+    <vcpu id=3D'0' pid=3D'3803519'/>
+  </vcpus>
+  <qemuCaps>
+    <flag name=3D'vnet-hdr'/>
+    <flag name=3D'qxl.vgamem_mb'/>
+    <flag name=3D'qxl-vga.vgamem_mb'/>
+    <flag name=3D'pc-dimm'/>
+  </qemuCaps>
+  <lockstate>testtest</lockstate>
+  <devices>
+    <device alias=3D'balloon0'/>
+    <device alias=3D'video0'/>
+    <device alias=3D'serial0'/>
+    <device alias=3D'net0'/>
+    <device alias=3D'usb'/>
+  </devices>
+  <numad nodeset=3D'0-2' cpuset=3D'1,3'/>
+  <libDir path=3D'/tmp'/>
+  <channelTargetDir path=3D'/var/lib/libvirt/qemu/channel/target'/>
+  <memoryBackingDir path=3D'/var/lib/libvirt/qemu/ram/1-QEMUGuest1'/>
+  <allowReboot value=3D'yes'/>
+  <nodename index=3D'0'/>
+  <fdset index=3D'0'/>
+  <blockjobs active=3D'no'/>
+  <agentTimeout>-2</agentTimeout>
+  <domain type=3D'qemu' id=3D'1'>
+    <name>QEMUGuest1</name>
+    <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+    <memory unit=3D'KiB'>219136</memory>
+    <currentMemory unit=3D'KiB'>219136</currentMemory>
+    <vcpu placement=3D'static'>1</vcpu>
+    <os>
+      <type arch=3D'i686' machine=3D'pc'>hvm</type>
+      <boot dev=3D'hd'/>
+    </os>
+    <clock offset=3D'utc'/>
+    <on_poweroff>destroy</on_poweroff>
+    <on_reboot>restart</on_reboot>
+    <on_crash>destroy</on_crash>
+    <devices>
+      <emulator>/usr/bin/qemu-system-i386</emulator>
+      <disk type=3D'block' device=3D'cdrom'>
+        <driver name=3D'qemu' type=3D'raw'/>
+        <source dev=3D'/dev/HostVG/QEMUGuest2'/>
+        <backingStore/>
+        <target dev=3D'hdc' bus=3D'ide'/>
+        <readonly/>
+        <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' un=
it=3D'0'/>
+      </disk>
+      <disk type=3D'file' device=3D'disk'>
+        <driver name=3D'qemu' type=3D'qcow2'/>
+        <source file=3D'/tmp/image.qcow2'/>
+        <backingStore/>
+        <dataFileStore type=3D'file'>
+          <format type=3D'raw'/>
+          <source file=3D'/tmp/data-file'>
+            <privateData>
+              <nodenames>
+                <nodename type=3D'storage' name=3D'test-storage-data-file'=
/>
+              </nodenames>
+            </privateData>
+          </source>
+        </dataFileStore>
+        <target dev=3D'vda' bus=3D'virtio'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03'=
 function=3D'0x0'/>
+      </disk>
+      <controller type=3D'usb' index=3D'0'>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01'=
 function=3D'0x2'/>
+      </controller>
+      <controller type=3D'ide' index=3D'0'>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01'=
 function=3D'0x1'/>
+      </controller>
+      <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+      <input type=3D'mouse' bus=3D'ps2'/>
+      <input type=3D'keyboard' bus=3D'ps2'/>
+      <audio id=3D'1' type=3D'none'/>
+      <memballoon model=3D'virtio'>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05'=
 function=3D'0x0'/>
+      </memballoon>
+    </devices>
+  </domain>
+</domstatus>
diff --git a/tests/qemustatusxml2xmldata/qcow2-data-file-out.xml b/tests/qe=
mustatusxml2xmldata/qcow2-data-file-out.xml
new file mode 100644
index 0000000000..40479dd3d6
--- /dev/null
+++ b/tests/qemustatusxml2xmldata/qcow2-data-file-out.xml
@@ -0,0 +1,86 @@
+<domstatus state=3D'running' reason=3D'booted' pid=3D'3803518'>
+  <taint flag=3D'high-privileges'/>
+  <monitor path=3D'/var/lib/libvirt/qemu/test.monitor' type=3D'unix'/>
+  <vcpus>
+    <vcpu id=3D'0' pid=3D'3803519'/>
+  </vcpus>
+  <qemuCaps>
+    <flag name=3D'vnet-hdr'/>
+    <flag name=3D'qxl.vgamem_mb'/>
+    <flag name=3D'qxl-vga.vgamem_mb'/>
+    <flag name=3D'pc-dimm'/>
+  </qemuCaps>
+  <lockstate>testtest</lockstate>
+  <devices>
+    <device alias=3D'balloon0'/>
+    <device alias=3D'video0'/>
+    <device alias=3D'serial0'/>
+    <device alias=3D'net0'/>
+    <device alias=3D'usb'/>
+  </devices>
+  <numad nodeset=3D'0-2' cpuset=3D'1,3'/>
+  <libDir path=3D'/tmp'/>
+  <channelTargetDir path=3D'/var/lib/libvirt/qemu/channel/target'/>
+  <memoryBackingDir path=3D'/var/lib/libvirt/qemu/ram/1-QEMUGuest1'/>
+  <allowReboot value=3D'yes'/>
+  <nodename index=3D'0'/>
+  <fdset index=3D'0'/>
+  <blockjobs active=3D'no'/>
+  <agentTimeout>-2</agentTimeout>
+  <domain type=3D'qemu' id=3D'1'>
+    <name>QEMUGuest1</name>
+    <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+    <memory unit=3D'KiB'>219136</memory>
+    <currentMemory unit=3D'KiB'>219136</currentMemory>
+    <vcpu placement=3D'static'>1</vcpu>
+    <os>
+      <type arch=3D'i686' machine=3D'pc'>hvm</type>
+      <boot dev=3D'hd'/>
+    </os>
+    <clock offset=3D'utc'/>
+    <on_poweroff>destroy</on_poweroff>
+    <on_reboot>restart</on_reboot>
+    <on_crash>destroy</on_crash>
+    <devices>
+      <emulator>/usr/bin/qemu-system-i386</emulator>
+      <disk type=3D'block' device=3D'cdrom'>
+        <driver name=3D'qemu' type=3D'raw'/>
+        <source dev=3D'/dev/HostVG/QEMUGuest2'/>
+        <backingStore/>
+        <target dev=3D'hdc' bus=3D'ide'/>
+        <readonly/>
+        <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' un=
it=3D'0'/>
+      </disk>
+      <disk type=3D'file' device=3D'disk'>
+        <driver name=3D'qemu' type=3D'qcow2'/>
+        <source file=3D'/tmp/image.qcow2'/>
+        <backingStore/>
+        <dataFileStore type=3D'file'>
+          <format type=3D'raw'/>
+          <source file=3D'/tmp/data-file'>
+            <privateData>
+              <nodenames>
+                <nodename type=3D'storage' name=3D'test-storage-data-file'=
/>
+              </nodenames>
+            </privateData>
+          </source>
+        </dataFileStore>
+        <target dev=3D'vda' bus=3D'virtio'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03'=
 function=3D'0x0'/>
+      </disk>
+      <controller type=3D'usb' index=3D'0'>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01'=
 function=3D'0x2'/>
+      </controller>
+      <controller type=3D'ide' index=3D'0'>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01'=
 function=3D'0x1'/>
+      </controller>
+      <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+      <input type=3D'mouse' bus=3D'ps2'/>
+      <input type=3D'keyboard' bus=3D'ps2'/>
+      <audio id=3D'1' type=3D'none'/>
+      <memballoon model=3D'virtio'>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05'=
 function=3D'0x0'/>
+      </memballoon>
+    </devices>
+  </domain>
+</domstatus>
diff --git a/tests/qemuxmlactivetest.c b/tests/qemuxmlactivetest.c
index 23ac807c76..8cf44090ce 100644
--- a/tests/qemuxmlactivetest.c
+++ b/tests/qemuxmlactivetest.c
@@ -250,6 +250,8 @@ mymain(void)
=20
     DO_TEST_STATUS("memory-backing-dir");
=20
+    DO_TEST_STATUS("qcow2-data-file");
+
  cleanup:
     qemuTestDriverFree(&driver);
=20
diff --git a/tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-latest.=
args b/tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-latest.args
new file mode 100644
index 0000000000..5a64246af6
--- /dev/null
+++ b/tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-latest.args
@@ -0,0 +1,51 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=3DQEMUGuest1,debug-threads=3Don \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi=
=3Doff \
+-accel tcg \
+-cpu qemu64 \
+-m size=3D219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
+-overcommit mem-lock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-boot strict=3Don \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0=
x2"}' \
+-blockdev '{"driver":"file","filename":"/tmp/data-file-store","node-name":=
"libvirt-9-storage","read-only":false}' \
+-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/path/to/sock"}=
,"export":"Volume2/Image","node-name":"libvirt-8-storage","auto-read-only":=
true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-8-format","read-only":false,"driver":"qco=
w2","data-file":"libvirt-9-storage","file":"libvirt-8-storage"}' \
+-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li=
bvirt-8-format","id":"virtio-disk0","bootindex":1}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no=
de-name":"libvirt-7-storage","read-only":false}' \
+-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsoc=
k"},"export":"bar","node-name":"libvirt-6-storage","auto-read-only":true,"d=
iscard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"qco=
w2","data-file":"libvirt-7-storage","file":"libvirt-6-storage"}' \
+-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li=
bvirt-6-format","id":"virtio-disk1"}' \
+-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/path/to/sock/d=
atafile"},"export":"Volume2/ImageDataFile","node-name":"libvirt-5-storage",=
"read-only":false}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/rhel7.1484=
071879","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"un=
map"}' \
+-blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"qco=
w2","data-file":"libvirt-5-storage","file":"libvirt-4-storage"}' \
+-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li=
bvirt-4-format","id":"virtio-disk2"}' \
+-blockdev '{"driver":"file","filename":"/tmp/data-file-store-2","node-name=
":"libvirt-3-storage","read-only":true}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/rhel7.1484=
071877","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"un=
map"}' \
+-blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"qcow=
2","data-file":"libvirt-3-storage","file":"libvirt-2-storage"}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/rhel7.1484=
071880","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"un=
map"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco=
w2","file":"libvirt-1-storage","backing":"libvirt-2-format"}' \
+-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li=
bvirt-1-format","id":"virtio-disk3"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x6"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
+-msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-latest.=
xml b/tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-latest.xml
new file mode 100644
index 0000000000..d0a6cb3238
--- /dev/null
+++ b/tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-latest.xml
@@ -0,0 +1,81 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source protocol=3D'nbd' name=3D'Volume2/Image'>
+        <host transport=3D'unix' socket=3D'/path/to/sock'/>
+      </source>
+      <dataFileStore type=3D'file'>
+        <format type=3D'raw'/>
+        <source file=3D'/tmp/data-file-store'/>
+      </dataFileStore>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source protocol=3D'nbd' name=3D'bar'>
+        <host transport=3D'unix' socket=3D'/var/run/nbdsock'/>
+      </source>
+      <dataFileStore type=3D'block'>
+        <format type=3D'raw'/>
+        <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      </dataFileStore>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source file=3D'/var/lib/libvirt/images/rhel7.1484071879'/>
+      <dataFileStore type=3D'network'>
+        <format type=3D'raw'/>
+        <source protocol=3D'nbd' name=3D'Volume2/ImageDataFile'>
+          <host transport=3D'unix' socket=3D'/path/to/sock/datafile'/>
+        </source>
+      </dataFileStore>
+      <target dev=3D'vdc' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source file=3D'/var/lib/libvirt/images/rhel7.1484071880'/>
+      <backingStore type=3D'file'>
+        <format type=3D'qcow2'/>
+        <source file=3D'/var/lib/libvirt/images/rhel7.1484071877'/>
+        <dataFileStore type=3D'file'>
+          <format type=3D'raw'/>
+          <source file=3D'/tmp/data-file-store-2'/>
+        </dataFileStore>
+      </backingStore>
+      <target dev=3D'vdd' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/disk-qcow2-datafile-store.xml b/tests/qe=
muxmlconfdata/disk-qcow2-datafile-store.xml
new file mode 100644
index 0000000000..797f8d6b34
--- /dev/null
+++ b/tests/qemuxmlconfdata/disk-qcow2-datafile-store.xml
@@ -0,0 +1,67 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source protocol=3D'nbd' name=3D'Volume2/Image'>
+        <host transport=3D'unix' socket=3D'/path/to/sock'/>
+      </source>
+      <dataFileStore type=3D'file'>
+        <format type=3D'raw'/>
+        <source file=3D'/tmp/data-file-store'/>
+      </dataFileStore>
+      <target dev=3D'vda' bus=3D'virtio'/>
+    </disk>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source protocol=3D'nbd' name=3D'bar'>
+        <host transport=3D'unix' socket=3D'/var/run/nbdsock'/>
+      </source>
+      <dataFileStore type=3D'block'>
+        <format type=3D'raw'/>
+        <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      </dataFileStore>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source file=3D'/var/lib/libvirt/images/rhel7.1484071879'/>
+      <dataFileStore type=3D'network'>
+        <format type=3D'raw'/>
+        <source protocol=3D'nbd' name=3D'Volume2/ImageDataFile'>
+          <host transport=3D'unix' socket=3D'/path/to/sock/datafile'/>
+        </source>
+      </dataFileStore>
+      <target dev=3D'vdc' bus=3D'virtio'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source file=3D'/var/lib/libvirt/images/rhel7.1484071880'/>
+      <backingStore type=3D'file'>
+        <format type=3D'qcow2'/>
+        <source file=3D'/var/lib/libvirt/images/rhel7.1484071877'/>
+        <dataFileStore type=3D'file'>
+          <format type=3D'raw'/>
+          <source file=3D'/tmp/data-file-store-2'/>
+        </dataFileStore>
+      </backingStore>
+      <target dev=3D'vdd' bus=3D'virtio'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <memballoon model=3D'virtio'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 194a4b8553..f3c8d0ae34 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -1651,6 +1651,7 @@ mymain(void)
     DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-incompatible-address");
     DO_TEST_CAPS_LATEST("disk-backing-chains-index");
     DO_TEST_CAPS_LATEST("disk-backing-chains-noindex");
+    DO_TEST_CAPS_LATEST("disk-qcow2-datafile-store");
     DO_TEST_CAPS_ARCH_LATEST_FULL("disk-source-fd", "x86_64",
                                   ARG_FD_GROUP, "testgroup2", 2, 200, 205,
                                   ARG_FD_GROUP, "testgroup5", 1, 204,
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index 75d04e8030..24893064ac 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -129,6 +129,76 @@ testPrepImages(void)
 }
=20
=20
+static void
+testPrepImagesWithQcow2DataFiles(char **chains)
+{
+    g_autoptr(virCommand) cmdData1 =3D NULL;
+    g_autoptr(virCommand) cmdData2 =3D NULL;
+    g_autoptr(virCommand) cmdqcow2_1 =3D NULL;
+    g_autoptr(virCommand) cmdqcow2_2_backing =3D NULL;
+    g_autoptr(virCommand) cmdqcow2_2 =3D NULL;
+    g_autofree char *data1 =3D g_strdup_printf("%s/data-1", datadir);
+    g_autofree char *data2 =3D g_strdup_printf("%s/data-2", datadir);
+    g_autofree char *qcow2_1 =3D g_strdup_printf("%s/qcow2-1", datadir);
+    g_autofree char *qcow2_1_opt_create =3D g_strdup_printf("data_file=3D%=
s,data_file_raw=3Dtrue", data1);
+    g_autofree char *qcow2_2_backing =3D g_strdup_printf("%s/qcow2-2-backi=
ng", datadir);
+    g_autofree char *qcow2_2_backing_opt_create =3D g_strdup_printf("data_=
file=3D%s,data_file_raw=3Dtrue", data2);
+    g_autofree char *qcow2_2 =3D g_strdup_printf("%s/qcow2-2", datadir);
+    g_autofree char *qemuimg =3D virFindFileInPath("qemu-img");
+
+    if (!qemuimg)
+        return;
+
+    /* Clean up from any earlier failed tests */
+    virFileDeleteTree(datadir);
+
+    if (g_mkdir_with_parents(datadir, 0777) < 0) {
+        VIR_TEST_VERBOSE("unable to create directory '%s'\n", datadir);
+        return;
+    }
+
+    /* create 2 chains containing data-file
+     * 1. qcow2 image with data-file
+     * 2. qcow2 image with backing qcow2 image containing data-file */
+    cmdData1 =3D virCommandNewArgList(qemuimg, "create",
+                                    "-f", "raw",
+                                    data1, "1k",  NULL);
+    cmdData2 =3D virCommandNewArgList(qemuimg, "create",
+                                    "-f", "raw",
+                                    data2, "1k",  NULL);
+
+    cmdqcow2_1 =3D virCommandNewArgList(qemuimg, "create",
+                                      "-f", "qcow2",
+                                      "-o", qcow2_1_opt_create,
+                                      qcow2_1, "1k", NULL);
+
+    cmdqcow2_2_backing =3D virCommandNewArgList(qemuimg, "create",
+                                              "-f", "qcow2",
+                                              "-o", qcow2_2_backing_opt_cr=
eate,
+                                              qcow2_2_backing, "1k", NULL);
+
+    cmdqcow2_2 =3D virCommandNewArgList(qemuimg, "create",
+                                      "-f", "qcow2",
+                                      "-F", "qcow2",
+                                      "-b", qcow2_2_backing,
+                                      qcow2_2, NULL);
+
+    if (virCommandRun(cmdData1, NULL) < 0 ||
+        virCommandRun(cmdData2, NULL) < 0 ||
+        virCommandRun(cmdqcow2_1, NULL) < 0 ||
+        virCommandRun(cmdqcow2_2_backing, NULL) < 0 ||
+        virCommandRun(cmdqcow2_2, NULL) < 0) {
+        VIR_TEST_VERBOSE("failed to create backing chain with data file in=
 '%s'\n", datadir);
+        return;
+    }
+
+    chains[0] =3D g_steal_pointer(&qcow2_1);
+    chains[1] =3D g_steal_pointer(&qcow2_2);
+
+    return;
+}
+
+
 enum {
     EXP_PASS =3D 0,
     EXP_FAIL =3D 1,
@@ -203,6 +273,26 @@ testStorageChain(const void *args)
                           NULLSTR(virStorageFileFormatTypeToString(elt->fo=
rmat)),
                           virStorageNetProtocolTypeToString(elt->protocol),
                           NULLSTR(elt->nhosts ? elt->hosts[0].name : NULL)=
);
+
+        if (elt->dataFileStore) {
+            g_autofree char *strippedPathDataFileRaw =3D virTestStablePath=
(elt->dataFileRaw);
+            g_autofree char *strippedPathDataFile =3D virTestStablePath(el=
t->dataFileStore->path);
+
+            virBufferAsprintf(&buf,
+                              "dataFileRaw: %s\n\n\n"
+                              "dataFileStoreSource:\n"
+                              "path: %s\n"
+                              "capacity: %lld\n"
+                              "encryption: %d\n"
+                              "type:%s\n"
+                              "format:%s\n",
+                              strippedPathDataFileRaw,
+                              strippedPathDataFile,
+                              elt->dataFileStore->capacity,
+                              !!elt->dataFileStore->encryption,
+                              NULLSTR(virStorageTypeToString(elt->dataFile=
Store->type)),
+                              NULLSTR(virStorageFileFormatTypeToString(elt=
->dataFileStore->format)));
+        }
     }
=20
     virBufferTrim(&buf, "\n");
@@ -419,6 +509,7 @@ mymain(void)
     struct testPathRelativeBacking data4;
     struct testBackingParseData data5;
     g_autofree char *realchain =3D NULL;
+    g_auto(GStrv) qcow2chainDataFile =3D g_new0(char *, 2);
     virStorageSource fakeChain[4];
     virStorageSource *chain =3D &fakeChain[0];
     virStorageSource *chain2 =3D &fakeChain[1];
@@ -462,6 +553,13 @@ mymain(void)
     TEST_CHAIN("qcow2-qcow2_qcow2-qcow2_raw-raw", realchain, VIR_STORAGE_F=
ILE_QCOW2, EXP_PASS);
     TEST_CHAIN("qcow2-auto_qcow2-qcow2_raw-raw", realchain, VIR_STORAGE_FI=
LE_AUTO, EXP_PASS);
=20
+    /* Prep 2 chains:
+     * 1) qcow2 image with data file
+     * 2) qcow2 -> qcow2 backing image with data file */
+    testPrepImagesWithQcow2DataFiles(qcow2chainDataFile);
+    TEST_CHAIN("qcow2-data_file", qcow2chainDataFile[0], VIR_STORAGE_FILE_=
QCOW2, EXP_PASS);
+    TEST_CHAIN("qcow2-qcow2_qcow2-qcow2-data_file", qcow2chainDataFile[1],=
 VIR_STORAGE_FILE_QCOW2, EXP_PASS);
+
     testCleanupImages();
=20
     /* Test various combinations of qcow2 images with missing 'backing_for=
mat' */
diff --git a/tests/virstoragetestdata/out/qcow2-data_file b/tests/virstorag=
etestdata/out/qcow2-data_file
new file mode 100644
index 0000000000..f132c9580a
--- /dev/null
+++ b/tests/virstoragetestdata/out/qcow2-data_file
@@ -0,0 +1,20 @@
+path:ABS_BUILDDIR/virstoragedata/qcow2-1
+backingStoreRaw: <null>
+backingStoreRawFormat: none(0)
+capacity: 1024
+encryption: 0
+relPath:<null>
+type:file
+format:qcow2
+protocol:none
+hostname:<null>
+
+dataFileRaw: ABS_BUILDDIR/virstoragedata/data-1
+
+
+dataFileStoreSource:
+path: ABS_BUILDDIR/virstoragedata/data-1
+capacity: 0
+encryption: 0
+type:file
+format:raw
diff --git a/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2-data_file=
 b/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2-data_file
new file mode 100644
index 0000000000..3cfb1833cc
--- /dev/null
+++ b/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2-data_file
@@ -0,0 +1,31 @@
+path:ABS_BUILDDIR/virstoragedata/qcow2-2
+backingStoreRaw: ABS_BUILDDIR/virstoragedata/qcow2-2-backing
+backingStoreRawFormat: qcow2(14)
+capacity: 1024
+encryption: 0
+relPath:<null>
+type:file
+format:qcow2
+protocol:none
+hostname:<null>
+
+path:ABS_BUILDDIR/virstoragedata/qcow2-2-backing
+backingStoreRaw: <null>
+backingStoreRawFormat: none(0)
+capacity: 1024
+encryption: 0
+relPath:<null>
+type:file
+format:qcow2
+protocol:none
+hostname:<null>
+
+dataFileRaw: ABS_BUILDDIR/virstoragedata/data-2
+
+
+dataFileStoreSource:
+path: ABS_BUILDDIR/virstoragedata/data-2
+capacity: 0
+encryption: 0
+type:file
+format:raw
--=20
2.43.5