From nobody Wed Jan 15 09:13:08 2025
Delivered-To: importer@patchew.org
Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied
 by domain of lists.libvirt.org) client-ip=8.43.85.245;
 envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org;
Authentication-Results: mx.zohomail.com;
	spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain
 of lists.libvirt.org)  smtp.mailfrom=devel-bounces@lists.libvirt.org;
	dmarc=fail(p=none dis=none)  header.from=redhat.com
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 1704732366262229.8105603541917;
 Mon, 8 Jan 2024 08:46:06 -0800 (PST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id F34FA1AA1; Mon,  8 Jan 2024 11:46:04 -0500 (EST)
Received: from lists.libvirt.org (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id 93E811ACD;
	Mon,  8 Jan 2024 11:07:52 -0500 (EST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 7167D1A4C; Mon,  8 Jan 2024 11:07:02 -0500 (EST)
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.129.124])
	(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 A8AFE19F1
	for <devel@lists.libvirt.org>; Mon,  8 Jan 2024 11:06:09 -0500 (EST)
Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com
 [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id
 us-mta-183-npXCIWjSOw20KTPDJhVfJw-1; Mon, 08 Jan 2024 11:06:07 -0500
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com
 [10.11.54.8])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest
 SHA256)
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0DAE685A58A
	for <devel@lists.libvirt.org>; Mon,  8 Jan 2024 16:06:06 +0000 (UTC)
Received: from speedmetal.lan (unknown [10.45.242.9])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 5B451C15A0C
	for <devel@lists.libvirt.org>; Mon,  8 Jan 2024 16:06:05 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No,
 score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,
	RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.4
X-MC-Unique: npXCIWjSOw20KTPDJhVfJw-1
From: Peter Krempa <pkrempa@redhat.com>
To: devel@lists.libvirt.org
Subject: [PATCH 10/23] qemuxmlactivetest: Add qemu active XML to
 active/inactive XML tests
Date: Mon,  8 Jan 2024 17:05:40 +0100
Message-ID: 
 <ddf625149053cf2cc837e7069ae63978b6873e58.1704729291.git.pkrempa@redhat.com>
In-Reply-To: <cover.1704729291.git.pkrempa@redhat.com>
References: <cover.1704729291.git.pkrempa@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Message-ID-Hash: Z6NB4APWPV3LFX3AEYMOGS6D6GZH65YJ
X-Message-ID-Hash: Z6NB4APWPV3LFX3AEYMOGS6D6GZH65YJ
X-MailFrom: pkrempa@redhat.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
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/Z6NB4APWPV3LFX3AEYMOGS6D6GZH65YJ/>
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>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-ZM-MESSAGEID: 1704732368276100001

Add explicit test cases for XMLs from qemuxml2argvdata which
historically had different output in qemuxml2xmltest.

qemuxmlactivetest explicitly ensures that the input XMLs are parsed in
'live' state and formatted both in inactive as well as live state,
rather than the previously present inactive->inactive,  live->live tests
only.

The XMLs picked in this case are those which had separate output files
in qemuxml2argvtest.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 ...-unix-source-path-active.x86_64-latest.xml |  62 +++++++
 ...nix-source-path-inactive.x86_64-latest.xml |  62 +++++++
 ...nnel-virtio-state-active.x86_64-latest.xml |  55 ++++++
 ...el-virtio-state-inactive.x86_64-latest.xml |  55 ++++++
 ...isk-active-commit-active.x86_64-latest.xml |  49 ++++++
 ...k-active-commit-inactive.x86_64-latest.xml |  45 +++++
 ...king-chains-index-active.x86_64-latest.xml | 164 ++++++++++++++++++
 ...ng-chains-index-inactive.x86_64-latest.xml | 164 ++++++++++++++++++
 .../disk-mirror-active.x86_64-latest.xml      |  97 +++++++++++
 .../disk-mirror-inactive.x86_64-latest.xml    |  70 ++++++++
 .../disk-mirror-old-active.x86_64-latest.xml  |  71 ++++++++
 ...disk-mirror-old-inactive.x86_64-latest.xml |  63 +++++++
 .../genid-active.x86_64-latest.xml            |  36 ++++
 .../genid-auto-active.x86_64-latest.xml       |  36 ++++
 .../genid-auto-inactive.x86_64-latest.xml     |  36 ++++
 .../genid-inactive.x86_64-latest.xml          |  36 ++++
 ...-generated-socket-active.x86_64-latest.xml |  45 +++++
 ...enerated-socket-inactive.x86_64-latest.xml |  45 +++++
 ...-static-labelskip-active.x86_64-latest.xml |  47 +++++
 ...tatic-labelskip-inactive.x86_64-latest.xml |  45 +++++
 tests/qemuxmlactivetest.c                     |  13 +-
 21 files changed, 1295 insertions(+), 1 deletion(-)
 create mode 100644 tests/qemuxmlactive2xmldata/channel-unix-source-path-ac=
tive.x86_64-latest.xml
 create mode 100644 tests/qemuxmlactive2xmldata/channel-unix-source-path-in=
active.x86_64-latest.xml
 create mode 100644 tests/qemuxmlactive2xmldata/channel-virtio-state-active=
.x86_64-latest.xml
 create mode 100644 tests/qemuxmlactive2xmldata/channel-virtio-state-inacti=
ve.x86_64-latest.xml
 create mode 100644 tests/qemuxmlactive2xmldata/disk-active-commit-active.x=
86_64-latest.xml
 create mode 100644 tests/qemuxmlactive2xmldata/disk-active-commit-inactive=
.x86_64-latest.xml
 create mode 100644 tests/qemuxmlactive2xmldata/disk-backing-chains-index-a=
ctive.x86_64-latest.xml
 create mode 100644 tests/qemuxmlactive2xmldata/disk-backing-chains-index-i=
nactive.x86_64-latest.xml
 create mode 100644 tests/qemuxmlactive2xmldata/disk-mirror-active.x86_64-l=
atest.xml
 create mode 100644 tests/qemuxmlactive2xmldata/disk-mirror-inactive.x86_64=
-latest.xml
 create mode 100644 tests/qemuxmlactive2xmldata/disk-mirror-old-active.x86_=
64-latest.xml
 create mode 100644 tests/qemuxmlactive2xmldata/disk-mirror-old-inactive.x8=
6_64-latest.xml
 create mode 100644 tests/qemuxmlactive2xmldata/genid-active.x86_64-latest.=
xml
 create mode 100644 tests/qemuxmlactive2xmldata/genid-auto-active.x86_64-la=
test.xml
 create mode 100644 tests/qemuxmlactive2xmldata/genid-auto-inactive.x86_64-=
latest.xml
 create mode 100644 tests/qemuxmlactive2xmldata/genid-inactive.x86_64-lates=
t.xml
 create mode 100644 tests/qemuxmlactive2xmldata/graphics-vnc-remove-generat=
ed-socket-active.x86_64-latest.xml
 create mode 100644 tests/qemuxmlactive2xmldata/graphics-vnc-remove-generat=
ed-socket-inactive.x86_64-latest.xml
 create mode 100644 tests/qemuxmlactive2xmldata/seclabel-static-labelskip-a=
ctive.x86_64-latest.xml
 create mode 100644 tests/qemuxmlactive2xmldata/seclabel-static-labelskip-i=
nactive.x86_64-latest.xml

diff --git a/tests/qemuxmlactive2xmldata/channel-unix-source-path-active.x8=
6_64-latest.xml b/tests/qemuxmlactive2xmldata/channel-unix-source-path-acti=
ve.x86_64-latest.xml
new file mode 100644
index 0000000000..a055cee79c
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/channel-unix-source-path-active.x86_64-la=
test.xml
@@ -0,0 +1,62 @@
+<domain type=3D'qemu' id=3D'1337'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</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>
+    <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'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <channel type=3D'unix'>
+      <source mode=3D'bind' path=3D'/var/lib/libvirt/qemu/channel/target/Q=
EMUGuest1.org.qemu.guest_agent.0'/>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.0'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'1=
'/>
+    </channel>
+    <channel type=3D'unix'>
+      <source mode=3D'bind' path=3D'/var/lib/libvirt/qemu/channel/target/d=
omain-QEMUGuest1/org.qemu.guest_agent.1'/>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.1'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'2=
'/>
+    </channel>
+    <channel type=3D'unix'>
+      <source mode=3D'bind' path=3D'/var/lib/libvirt/qemu/channel/target/d=
omain-1-QEMUGuest1/org.qemu.guest_agent.2'/>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.2'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'3=
'/>
+    </channel>
+    <channel type=3D'unix'>
+      <source mode=3D'bind' path=3D'/var/lib/libvirt/qemu/channel/target/Q=
EMUGuest1/org.qemu.guest_agent.3'/>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.3'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'4=
'/>
+    </channel>
+    <channel type=3D'unix'>
+      <source mode=3D'bind' path=3D'/var/lib/libvirt/qemu/channel/1-QEMUGu=
est1/org.qemu.guest_agent.4'/>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.4'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'5=
'/>
+    </channel>
+    <channel type=3D'unix'>
+      <source mode=3D'bind' path=3D'/var/run/libvirt/qemu/channel/1-QEMUGu=
est1/org.qemu.guest_agent.5'/>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.5'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'6=
'/>
+    </channel>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/channel-unix-source-path-inactive.=
x86_64-latest.xml b/tests/qemuxmlactive2xmldata/channel-unix-source-path-in=
active.x86_64-latest.xml
new file mode 100644
index 0000000000..022ad7025a
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/channel-unix-source-path-inactive.x86_64-=
latest.xml
@@ -0,0 +1,62 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</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>
+    <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'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <channel type=3D'unix'>
+      <source mode=3D'bind' path=3D'/var/lib/libvirt/qemu/channel/target/Q=
EMUGuest1.org.qemu.guest_agent.0'/>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.0'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'1=
'/>
+    </channel>
+    <channel type=3D'unix'>
+      <source mode=3D'bind' path=3D'/var/lib/libvirt/qemu/channel/target/d=
omain-QEMUGuest1/org.qemu.guest_agent.1'/>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.1'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'2=
'/>
+    </channel>
+    <channel type=3D'unix'>
+      <source mode=3D'bind' path=3D'/var/lib/libvirt/qemu/channel/target/d=
omain-1-QEMUGuest1/org.qemu.guest_agent.2'/>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.2'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'3=
'/>
+    </channel>
+    <channel type=3D'unix'>
+      <source mode=3D'bind' path=3D'/var/lib/libvirt/qemu/channel/target/Q=
EMUGuest1/org.qemu.guest_agent.3'/>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.3'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'4=
'/>
+    </channel>
+    <channel type=3D'unix'>
+      <source mode=3D'bind' path=3D'/var/lib/libvirt/qemu/channel/1-QEMUGu=
est1/org.qemu.guest_agent.4'/>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.4'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'5=
'/>
+    </channel>
+    <channel type=3D'unix'>
+      <source mode=3D'bind' path=3D'/var/run/libvirt/qemu/channel/1-QEMUGu=
est1/org.qemu.guest_agent.5'/>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.5'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'6=
'/>
+    </channel>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/channel-virtio-state-active.x86_64=
-latest.xml b/tests/qemuxmlactive2xmldata/channel-virtio-state-active.x86_6=
4-latest.xml
new file mode 100644
index 0000000000..a4ffae81e8
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/channel-virtio-state-active.x86_64-latest=
.xml
@@ -0,0 +1,55 @@
+<domain type=3D'qemu' id=3D'2'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'1-4,8-20,525'>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'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </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'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'1'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0a' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.foo' state=3D'con=
nected'/>
+      <address type=3D'virtio-serial' controller=3D'1' bus=3D'0' port=3D'3=
'/>
+    </channel>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.foo1' state=3D'di=
sconnected'/>
+      <address type=3D'virtio-serial' controller=3D'1' bus=3D'0' port=3D'4=
'/>
+    </channel>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.foo2'/>
+      <address type=3D'virtio-serial' controller=3D'1' bus=3D'0' port=3D'5=
'/>
+    </channel>
+    <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'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/channel-virtio-state-inactive.x86_=
64-latest.xml b/tests/qemuxmlactive2xmldata/channel-virtio-state-inactive.x=
86_64-latest.xml
new file mode 100644
index 0000000000..40bd003c59
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/channel-virtio-state-inactive.x86_64-late=
st.xml
@@ -0,0 +1,55 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'1-4,8-20,525'>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'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </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'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'1'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0a' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.foo'/>
+      <address type=3D'virtio-serial' controller=3D'1' bus=3D'0' port=3D'3=
'/>
+    </channel>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.foo1'/>
+      <address type=3D'virtio-serial' controller=3D'1' bus=3D'0' port=3D'4=
'/>
+    </channel>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.foo2'/>
+      <address type=3D'virtio-serial' controller=3D'1' bus=3D'0' port=3D'5=
'/>
+    </channel>
+    <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'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/disk-active-commit-active.x86_64-l=
atest.xml b/tests/qemuxmlactive2xmldata/disk-active-commit-active.x86_64-la=
test.xml
new file mode 100644
index 0000000000..cbe47150a9
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/disk-active-commit-active.x86_64-latest.x=
ml
@@ -0,0 +1,49 @@
+<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'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'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source file=3D'/tmp/HostVG/QEMUGuest1-snap'/>
+      <backingStore type=3D'block' index=3D'1'>
+        <format type=3D'raw'/>
+        <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+        <backingStore/>
+      </backingStore>
+      <mirror type=3D'block' job=3D'active-commit'>
+        <format type=3D'raw'/>
+        <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      </mirror>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </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'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=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'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/disk-active-commit-inactive.x86_64=
-latest.xml b/tests/qemuxmlactive2xmldata/disk-active-commit-inactive.x86_6=
4-latest.xml
new file mode 100644
index 0000000000..60e6a690af
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/disk-active-commit-inactive.x86_64-latest=
.xml
@@ -0,0 +1,45 @@
+<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'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source file=3D'/tmp/HostVG/QEMUGuest1-snap'/>
+      <backingStore type=3D'block' index=3D'1'>
+        <format type=3D'raw'/>
+        <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+        <backingStore/>
+      </backingStore>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </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'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=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'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/disk-backing-chains-index-active.x=
86_64-latest.xml b/tests/qemuxmlactive2xmldata/disk-backing-chains-index-ac=
tive.x86_64-latest.xml
new file mode 100644
index 0000000000..fec48e863b
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/disk-backing-chains-index-active.x86_64-l=
atest.xml
@@ -0,0 +1,164 @@
+<domain type=3D'qemu' id=3D'1337'>
+  <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'gluster' name=3D'Volume2/Image' index=3D'2'>
+        <host transport=3D'unix' socket=3D'/path/to/sock'/>
+      </source>
+      <backingStore type=3D'file' index=3D'1'>
+        <format type=3D'qcow2'/>
+        <source file=3D'/tmp/missing-backing-store.qcow'/>
+      </backingStore>
+      <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' index=3D'9'>
+        <host transport=3D'unix' socket=3D'/var/run/nbdsock'/>
+      </source>
+      <backingStore type=3D'block' index=3D'8'>
+        <format type=3D'qcow2'/>
+        <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+        <backingStore type=3D'file' index=3D'7'>
+          <format type=3D'vmdk'/>
+          <source file=3D'/tmp/image2'/>
+          <backingStore type=3D'file' index=3D'6'>
+            <format type=3D'qcow2'/>
+            <source file=3D'/tmp/image3.qcow'>
+              <seclabel model=3D'selinux' relabel=3D'yes'>
+                <label>system_u:system_r:public_content_t:s0</label>
+              </seclabel>
+            </source>
+            <backingStore type=3D'file' index=3D'5'>
+              <format type=3D'qcow2'/>
+              <source file=3D'/tmp/image4.qcow'/>
+              <backingStore type=3D'file' index=3D'4'>
+                <format type=3D'qcow2'/>
+                <source file=3D'/tmp/image5.qcow'/>
+                <backingStore type=3D'file' index=3D'3'>
+                  <format type=3D'raw'/>
+                  <source file=3D'/tmp/Fedora-17-x86_64-Live-KDE.iso'/>
+                  <backingStore/>
+                </backingStore>
+              </backingStore>
+            </backingStore>
+          </backingStore>
+        </backingStore>
+      </backingStore>
+      <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'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'gluster' name=3D'Volume1/Image' index=3D'10'>
+        <host name=3D'example.org' port=3D'6000'/>
+      </source>
+      <backingStore/>
+      <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'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <auth username=3D'myname'>
+        <secret type=3D'ceph' usage=3D'mycluster_myname'/>
+      </auth>
+      <source protocol=3D'rbd' name=3D'pool/image' index=3D'12'>
+        <host name=3D'mon1.example.org' port=3D'6321'/>
+        <host name=3D'mon2.example.org' port=3D'6322'/>
+        <host name=3D'mon3.example.org' port=3D'6322'/>
+      </source>
+      <backingStore type=3D'file' index=3D'11'>
+        <format type=3D'qcow2'/>
+        <source file=3D'/tmp/image.qcow'/>
+        <backingStore/>
+      </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>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest11' index=3D'13'/>
+      <target dev=3D'vde' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' 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' index=3D'2=
5'/>
+      <backingStore type=3D'file' index=3D'24'>
+        <format type=3D'qcow2'/>
+        <source file=3D'/var/lib/libvirt/images/rhel7.1484071877'/>
+        <backingStore type=3D'file' index=3D'23'>
+          <format type=3D'qcow2'/>
+          <source file=3D'/var/lib/libvirt/images/rhel7.1484071876'/>
+          <backingStore type=3D'file' index=3D'22'>
+            <format type=3D'qcow2'/>
+            <source file=3D'/var/lib/libvirt/images/rhel7.1484071872'/>
+            <backingStore type=3D'file' index=3D'21'>
+              <format type=3D'qcow2'/>
+              <source file=3D'/var/lib/libvirt/images/rhel7.1483615252'/>
+              <backingStore type=3D'file' index=3D'20'>
+                <format type=3D'qcow2'/>
+                <source file=3D'/var/lib/libvirt/images/rhel7.1483605924'/>
+                <backingStore type=3D'file' index=3D'19'>
+                  <format type=3D'qcow2'/>
+                  <source file=3D'/var/lib/libvirt/images/rhel7.1483605920=
'/>
+                  <backingStore type=3D'file' index=3D'18'>
+                    <format type=3D'qcow2'/>
+                    <source file=3D'/var/lib/libvirt/images/rhel7.14835462=
44'/>
+                    <backingStore type=3D'file' index=3D'17'>
+                      <format type=3D'qcow2'/>
+                      <source file=3D'/var/lib/libvirt/images/rhel7.148354=
5901'/>
+                      <backingStore type=3D'file' index=3D'16'>
+                        <format type=3D'qcow2'/>
+                        <source file=3D'/var/lib/libvirt/images/rhel7.1483=
545313'/>
+                        <backingStore type=3D'file' index=3D'15'>
+                          <format type=3D'qcow2'/>
+                          <source file=3D'/var/lib/libvirt/images/rhel7.14=
83536402'/>
+                          <backingStore type=3D'file' index=3D'14'>
+                            <format type=3D'qcow2'/>
+                            <source file=3D'/var/lib/libvirt/images/rhel7.=
qcow2'/>
+                            <backingStore/>
+                          </backingStore>
+                        </backingStore>
+                      </backingStore>
+                    </backingStore>
+                  </backingStore>
+                </backingStore>
+              </backingStore>
+            </backingStore>
+          </backingStore>
+        </backingStore>
+      </backingStore>
+      <target dev=3D'vdf' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07' 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'0x08' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/disk-backing-chains-index-inactive=
.x86_64-latest.xml b/tests/qemuxmlactive2xmldata/disk-backing-chains-index-=
inactive.x86_64-latest.xml
new file mode 100644
index 0000000000..52c8ad6f29
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/disk-backing-chains-index-inactive.x86_64=
-latest.xml
@@ -0,0 +1,164 @@
+<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'gluster' name=3D'Volume2/Image' index=3D'2'>
+        <host transport=3D'unix' socket=3D'/path/to/sock'/>
+      </source>
+      <backingStore type=3D'file' index=3D'1'>
+        <format type=3D'qcow2'/>
+        <source file=3D'/tmp/missing-backing-store.qcow'/>
+      </backingStore>
+      <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' index=3D'9'>
+        <host transport=3D'unix' socket=3D'/var/run/nbdsock'/>
+      </source>
+      <backingStore type=3D'block' index=3D'8'>
+        <format type=3D'qcow2'/>
+        <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+        <backingStore type=3D'file' index=3D'7'>
+          <format type=3D'vmdk'/>
+          <source file=3D'/tmp/image2'/>
+          <backingStore type=3D'file' index=3D'6'>
+            <format type=3D'qcow2'/>
+            <source file=3D'/tmp/image3.qcow'>
+              <seclabel model=3D'selinux' relabel=3D'yes'>
+                <label>system_u:system_r:public_content_t:s0</label>
+              </seclabel>
+            </source>
+            <backingStore type=3D'file' index=3D'5'>
+              <format type=3D'qcow2'/>
+              <source file=3D'/tmp/image4.qcow'/>
+              <backingStore type=3D'file' index=3D'4'>
+                <format type=3D'qcow2'/>
+                <source file=3D'/tmp/image5.qcow'/>
+                <backingStore type=3D'file' index=3D'3'>
+                  <format type=3D'raw'/>
+                  <source file=3D'/tmp/Fedora-17-x86_64-Live-KDE.iso'/>
+                  <backingStore/>
+                </backingStore>
+              </backingStore>
+            </backingStore>
+          </backingStore>
+        </backingStore>
+      </backingStore>
+      <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'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'gluster' name=3D'Volume1/Image' index=3D'10'>
+        <host name=3D'example.org' port=3D'6000'/>
+      </source>
+      <backingStore/>
+      <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'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <auth username=3D'myname'>
+        <secret type=3D'ceph' usage=3D'mycluster_myname'/>
+      </auth>
+      <source protocol=3D'rbd' name=3D'pool/image' index=3D'12'>
+        <host name=3D'mon1.example.org' port=3D'6321'/>
+        <host name=3D'mon2.example.org' port=3D'6322'/>
+        <host name=3D'mon3.example.org' port=3D'6322'/>
+      </source>
+      <backingStore type=3D'file' index=3D'11'>
+        <format type=3D'qcow2'/>
+        <source file=3D'/tmp/image.qcow'/>
+        <backingStore/>
+      </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>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest11' index=3D'13'/>
+      <target dev=3D'vde' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' 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' index=3D'2=
5'/>
+      <backingStore type=3D'file' index=3D'24'>
+        <format type=3D'qcow2'/>
+        <source file=3D'/var/lib/libvirt/images/rhel7.1484071877'/>
+        <backingStore type=3D'file' index=3D'23'>
+          <format type=3D'qcow2'/>
+          <source file=3D'/var/lib/libvirt/images/rhel7.1484071876'/>
+          <backingStore type=3D'file' index=3D'22'>
+            <format type=3D'qcow2'/>
+            <source file=3D'/var/lib/libvirt/images/rhel7.1484071872'/>
+            <backingStore type=3D'file' index=3D'21'>
+              <format type=3D'qcow2'/>
+              <source file=3D'/var/lib/libvirt/images/rhel7.1483615252'/>
+              <backingStore type=3D'file' index=3D'20'>
+                <format type=3D'qcow2'/>
+                <source file=3D'/var/lib/libvirt/images/rhel7.1483605924'/>
+                <backingStore type=3D'file' index=3D'19'>
+                  <format type=3D'qcow2'/>
+                  <source file=3D'/var/lib/libvirt/images/rhel7.1483605920=
'/>
+                  <backingStore type=3D'file' index=3D'18'>
+                    <format type=3D'qcow2'/>
+                    <source file=3D'/var/lib/libvirt/images/rhel7.14835462=
44'/>
+                    <backingStore type=3D'file' index=3D'17'>
+                      <format type=3D'qcow2'/>
+                      <source file=3D'/var/lib/libvirt/images/rhel7.148354=
5901'/>
+                      <backingStore type=3D'file' index=3D'16'>
+                        <format type=3D'qcow2'/>
+                        <source file=3D'/var/lib/libvirt/images/rhel7.1483=
545313'/>
+                        <backingStore type=3D'file' index=3D'15'>
+                          <format type=3D'qcow2'/>
+                          <source file=3D'/var/lib/libvirt/images/rhel7.14=
83536402'/>
+                          <backingStore type=3D'file' index=3D'14'>
+                            <format type=3D'qcow2'/>
+                            <source file=3D'/var/lib/libvirt/images/rhel7.=
qcow2'/>
+                            <backingStore/>
+                          </backingStore>
+                        </backingStore>
+                      </backingStore>
+                    </backingStore>
+                  </backingStore>
+                </backingStore>
+              </backingStore>
+            </backingStore>
+          </backingStore>
+        </backingStore>
+      </backingStore>
+      <target dev=3D'vdf' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07' 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'0x08' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/disk-mirror-active.x86_64-latest.x=
ml b/tests/qemuxmlactive2xmldata/disk-mirror-active.x86_64-latest.xml
new file mode 100644
index 0000000000..0cd61afa5c
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/disk-mirror-active.x86_64-latest.xml
@@ -0,0 +1,97 @@
+<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'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'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <backingStore/>
+      <mirror type=3D'block' job=3D'copy' ready=3D'yes'>
+        <format type=3D'raw'/>
+        <source dev=3D'/dev/HostVG/QEMUGuest1Copy'/>
+      </mirror>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <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' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/data.img'/>
+      <backingStore/>
+      <mirror type=3D'file' file=3D'/tmp/copy.img' format=3D'qcow2' job=3D=
'copy'>
+        <format type=3D'qcow2'/>
+        <source file=3D'/tmp/copy.img'/>
+        <backingStore/>
+      </mirror>
+      <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'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/logs.img'/>
+      <backingStore/>
+      <mirror type=3D'file' file=3D'/tmp/logcopy.img' format=3D'qcow2' job=
=3D'copy' ready=3D'abort'>
+        <format type=3D'qcow2'/>
+        <source file=3D'/tmp/logcopy.img' index=3D'1'/>
+        <backingStore type=3D'block' index=3D'2'>
+          <format type=3D'raw'/>
+          <source dev=3D'/dev/HostVG/backing'/>
+          <backingStore/>
+        </backingStore>
+      </mirror>
+      <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'raw'/>
+      <source file=3D'/tmp/data2.img'/>
+      <backingStore/>
+      <mirror type=3D'file' file=3D'/tmp/copy2.img' format=3D'qcow2' job=
=3D'copy'>
+        <format type=3D'qcow2'>
+          <metadata_cache>
+            <max_size unit=3D'bytes'>1234</max_size>
+          </metadata_cache>
+        </format>
+        <source file=3D'/tmp/copy2.img'/>
+        <backingStore/>
+      </mirror>
+      <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>
+    <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'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=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' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/disk-mirror-inactive.x86_64-latest=
.xml b/tests/qemuxmlactive2xmldata/disk-mirror-inactive.x86_64-latest.xml
new file mode 100644
index 0000000000..f94cd6519f
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/disk-mirror-inactive.x86_64-latest.xml
@@ -0,0 +1,70 @@
+<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'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <backingStore/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <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' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/data.img'/>
+      <backingStore/>
+      <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'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/logs.img'/>
+      <backingStore/>
+      <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'raw'/>
+      <source file=3D'/tmp/data2.img'/>
+      <backingStore/>
+      <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>
+    <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'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=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' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/disk-mirror-old-active.x86_64-late=
st.xml b/tests/qemuxmlactive2xmldata/disk-mirror-old-active.x86_64-latest.x=
ml
new file mode 100644
index 0000000000..0732cf9e9c
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/disk-mirror-old-active.x86_64-latest.xml
@@ -0,0 +1,71 @@
+<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'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'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <backingStore/>
+      <mirror type=3D'file' file=3D'/dev/HostVG/QEMUGuest1Copy' format=3D'=
raw' job=3D'copy' ready=3D'yes'>
+        <format type=3D'raw'/>
+        <source file=3D'/dev/HostVG/QEMUGuest1Copy'/>
+      </mirror>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <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' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/data.img'/>
+      <backingStore/>
+      <mirror type=3D'file' file=3D'/tmp/copy.img' format=3D'qcow2' job=3D=
'copy'>
+        <format type=3D'qcow2'/>
+        <source file=3D'/tmp/copy.img'/>
+      </mirror>
+      <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'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/logs.img'/>
+      <backingStore/>
+      <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>
+    <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'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=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'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/disk-mirror-old-inactive.x86_64-la=
test.xml b/tests/qemuxmlactive2xmldata/disk-mirror-old-inactive.x86_64-late=
st.xml
new file mode 100644
index 0000000000..ec598bfdbd
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/disk-mirror-old-inactive.x86_64-latest.xml
@@ -0,0 +1,63 @@
+<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'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <backingStore/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <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' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/data.img'/>
+      <backingStore/>
+      <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'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/logs.img'/>
+      <backingStore/>
+      <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>
+    <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'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=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'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/genid-active.x86_64-latest.xml b/t=
ests/qemuxmlactive2xmldata/genid-active.x86_64-latest.xml
new file mode 100644
index 0000000000..06a01bb688
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/genid-active.x86_64-latest.xml
@@ -0,0 +1,36 @@
+<domain type=3D'qemu' id=3D'1'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <genid>e9392370-2917-565e-692b-d057f46512d6</genid>
+  <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>
+  <features>
+    <acpi/>
+  </features>
+  <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>
+    <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'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=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'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/genid-auto-active.x86_64-latest.xm=
l b/tests/qemuxmlactive2xmldata/genid-auto-active.x86_64-latest.xml
new file mode 100644
index 0000000000..ce3af24282
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/genid-auto-active.x86_64-latest.xml
@@ -0,0 +1,36 @@
+<domain type=3D'qemu' id=3D'1'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <genid>00010203-0405-4607-8809-0a0b0c0d0e0f</genid>
+  <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>
+  <features>
+    <acpi/>
+  </features>
+  <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>
+    <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'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=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'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/genid-auto-inactive.x86_64-latest.=
xml b/tests/qemuxmlactive2xmldata/genid-auto-inactive.x86_64-latest.xml
new file mode 100644
index 0000000000..a0b9e156b7
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/genid-auto-inactive.x86_64-latest.xml
@@ -0,0 +1,36 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <genid>00010203-0405-4607-8809-0a0b0c0d0e0f</genid>
+  <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>
+  <features>
+    <acpi/>
+  </features>
+  <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>
+    <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'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=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'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/genid-inactive.x86_64-latest.xml b=
/tests/qemuxmlactive2xmldata/genid-inactive.x86_64-latest.xml
new file mode 100644
index 0000000000..9406c6e48a
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/genid-inactive.x86_64-latest.xml
@@ -0,0 +1,36 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <genid>e9392370-2917-565e-692b-d057f46512d6</genid>
+  <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>
+  <features>
+    <acpi/>
+  </features>
+  <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>
+    <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'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=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'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/graphics-vnc-remove-generated-sock=
et-active.x86_64-latest.xml b/tests/qemuxmlactive2xmldata/graphics-vnc-remo=
ve-generated-socket-active.x86_64-latest.xml
new file mode 100644
index 0000000000..60508b2c39
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/graphics-vnc-remove-generated-socket-acti=
ve.x86_64-latest.xml
@@ -0,0 +1,45 @@
+<domain type=3D'qemu' id=3D'1337'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</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'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </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'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=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'/>
+    <graphics type=3D'vnc' socket=3D'/var/lib/libvirt/qemu/domain-99-QEMUG=
uest1/delete.this.socket'>
+      <listen type=3D'socket' socket=3D'/var/lib/libvirt/qemu/domain-99-QE=
MUGuest1/delete.this.socket'/>
+    </graphics>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/graphics-vnc-remove-generated-sock=
et-inactive.x86_64-latest.xml b/tests/qemuxmlactive2xmldata/graphics-vnc-re=
move-generated-socket-inactive.x86_64-latest.xml
new file mode 100644
index 0000000000..f61470a339
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/graphics-vnc-remove-generated-socket-inac=
tive.x86_64-latest.xml
@@ -0,0 +1,45 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</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'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </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'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=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'/>
+    <graphics type=3D'vnc' socket=3D'/var/lib/libvirt/qemu/domain-99-QEMUG=
uest1/delete.this.socket'>
+      <listen type=3D'socket' socket=3D'/var/lib/libvirt/qemu/domain-99-QE=
MUGuest1/delete.this.socket'/>
+    </graphics>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/seclabel-static-labelskip-active.x=
86_64-latest.xml b/tests/qemuxmlactive2xmldata/seclabel-static-labelskip-ac=
tive.x86_64-latest.xml
new file mode 100644
index 0000000000..986bf3db4e
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/seclabel-static-labelskip-active.x86_64-l=
atest.xml
@@ -0,0 +1,47 @@
+<domain type=3D'qemu' id=3D'1'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'1-4,8-20,525'>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'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'>
+        <seclabel model=3D'selinux' labelskip=3D'yes'/>
+      </source>
+      <backingStore/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </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'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=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'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+  <seclabel type=3D'static' model=3D'selinux' relabel=3D'yes'>
+    <label>system_u:system_r:svirt_custom_t:s0:c192,c392</label>
+    <imagelabel>system_u:system_r:svirt_custom_t:s0:c192,c392</imagelabel>
+  </seclabel>
+</domain>
diff --git a/tests/qemuxmlactive2xmldata/seclabel-static-labelskip-inactive=
.x86_64-latest.xml b/tests/qemuxmlactive2xmldata/seclabel-static-labelskip-=
inactive.x86_64-latest.xml
new file mode 100644
index 0000000000..3496414adb
--- /dev/null
+++ b/tests/qemuxmlactive2xmldata/seclabel-static-labelskip-inactive.x86_64=
-latest.xml
@@ -0,0 +1,45 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'1-4,8-20,525'>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'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <backingStore/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </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'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=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'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+  <seclabel type=3D'static' model=3D'selinux' relabel=3D'yes'>
+    <label>system_u:system_r:svirt_custom_t:s0:c192,c392</label>
+    <imagelabel>system_u:system_r:svirt_custom_t:s0:c192,c392</imagelabel>
+  </seclabel>
+</domain>
diff --git a/tests/qemuxmlactivetest.c b/tests/qemuxmlactivetest.c
index f892a1fbbe..a8946fb57e 100644
--- a/tests/qemuxmlactivetest.c
+++ b/tests/qemuxmlactivetest.c
@@ -156,7 +156,7 @@ testqemuActiveXML2XMLInactive(const void *opaque)
 }


-static void G_GNUC_UNUSED
+static void
 testRunActive(const char *name,
               const char *suffix,
               struct testQemuConf *testConf,
@@ -217,6 +217,17 @@ mymain(void)
     testRunActive(_name, ".x86_64-latest", &testConf, &ret, \
                   ARG_CAPS_ARCH, "x86_64", ARG_CAPS_VER, "latest", ARG_END=
);

+    DO_TEST_ACTIVE_CAPS_LATEST("channel-unix-source-path");
+    DO_TEST_ACTIVE_CAPS_LATEST("channel-virtio-state");
+    DO_TEST_ACTIVE_CAPS_LATEST("disk-active-commit");
+    DO_TEST_ACTIVE_CAPS_LATEST("disk-backing-chains-index");
+    DO_TEST_ACTIVE_CAPS_LATEST("disk-mirror");
+    DO_TEST_ACTIVE_CAPS_LATEST("disk-mirror-old");
+    DO_TEST_ACTIVE_CAPS_LATEST("genid");
+    DO_TEST_ACTIVE_CAPS_LATEST("genid-auto");
+    DO_TEST_ACTIVE_CAPS_LATEST("graphics-vnc-remove-generated-socket");
+    DO_TEST_ACTIVE_CAPS_LATEST("seclabel-static-labelskip");
+
 #define DO_TEST_STATUS(_name) \
     do { \
         if (testRunStatus(_name, &testConf, ARG_END) < 0) \
--=20
2.43.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org