From nobody Wed Jan 15 09:43:59 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 170473288893528.445716645193897;
 Mon, 8 Jan 2024 08:54:48 -0800 (PST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 843131A07; Mon,  8 Jan 2024 11:54:47 -0500 (EST)
Received: from lists.libvirt.org (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id EEC491A26;
	Mon,  8 Jan 2024 11:08:21 -0500 (EST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 8FF6C1A52; Mon,  8 Jan 2024 11:07:08 -0500 (EST)
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.133.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 87F2B1A00
	for <devel@lists.libvirt.org>; Mon,  8 Jan 2024 11:06:10 -0500 (EST)
Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])
 by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
 cipher=TLS_AES_256_GCM_SHA384) id us-mta-594-RuSa6Yy9MTWZRtL_S6XEFw-1; Mon,
 08 Jan 2024 11:06:08 -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 EF8F23C100A3
	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 61CC9C15968
	for <devel@lists.libvirt.org>; Mon,  8 Jan 2024 16:06:06 +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_H3,
	RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.4
X-MC-Unique: RuSa6Yy9MTWZRtL_S6XEFw-1
From: Peter Krempa <pkrempa@redhat.com>
To: devel@lists.libvirt.org
Subject: [PATCH 11/23] qemuxml2xmltest: Parse all input files as inactive
Date: Mon,  8 Jan 2024 17:05:41 +0100
Message-ID: 
 <3c1131b7f17b907ed9ad014492dd8dcf372e1e8b.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: UF7556GQRNQYQGAKO5DPIBSQV647RCB7
X-Message-ID-Hash: UF7556GQRNQYQGAKO5DPIBSQV647RCB7
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/UF7556GQRNQYQGAKO5DPIBSQV647RCB7/>
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: 1704732890917100001

In previous patches we've added testing of XML's explicitly parsed as
active (ensuring that it e.g. has a domain id) formatted into both
active and inactive versions.

Now qemuxml2xmltest can be simplified by making it test only XMLs parsed
as inactive.

To do this we pass VIR_DOMAIN_DEF_PARSE_INACTIVE in parseFlags. This
will also cause that all output files will become identical so the setup
of the test cases can be simplified by using the non-split output file
name.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 ...-unix-source-path-active.x86_64-latest.xml |  62 -------
 ...hannel-unix-source-path.x86_64-latest.xml} |   0
 ...nnel-virtio-state-active.x86_64-latest.xml |  55 ------
 ...=3D> channel-virtio-state.x86_64-latest.xml} |   0
 ...isk-active-commit-active.x86_64-latest.xml |  49 ------
 ...l =3D> disk-active-commit.x86_64-latest.xml} |   0
 ...king-chains-index-active.x86_64-latest.xml | 164 ------------------
 ...sk-backing-chains-index.x86_64-latest.xml} |   0
 .../disk-mirror-active.x86_64-latest.xml      |  97 -----------
 .../disk-mirror-old-active.x86_64-latest.xml  |  71 --------
 ....xml =3D> disk-mirror-old.x86_64-latest.xml} |   0
 ...test.xml =3D> disk-mirror.x86_64-latest.xml} |   0
 .../genid-active.x86_64-latest.xml            |  36 ----
 .../genid-auto-active.x86_64-latest.xml       |  36 ----
 ...atest.xml =3D> genid-auto.x86_64-latest.xml} |   0
 ..._64-latest.xml =3D> genid.x86_64-latest.xml} |   0
 ...-generated-socket-active.x86_64-latest.xml |  45 -----
 ...remove-generated-socket.x86_64-latest.xml} |   0
 ...label-dynamic-baselabel.x86_64-latest.xml} |   0
 ...label-dynamic-labelskip.x86_64-latest.xml} |   0
 ...el-dynamic-none-relabel.x86_64-latest.xml} |   0
 ...clabel-dynamic-override.x86_64-latest.xml} |   0
 ...eclabel-dynamic-relabel.x86_64-latest.xml} |   0
 ...-static-labelskip-active.x86_64-latest.xml |  47 -----
 ...clabel-static-labelskip.x86_64-latest.xml} |   0
 tests/qemuxml2xmltest.c                       |  47 +----
 26 files changed, 6 insertions(+), 703 deletions(-)
 delete mode 100644 tests/qemuxml2xmloutdata/channel-unix-source-path-activ=
e.x86_64-latest.xml
 rename tests/qemuxml2xmloutdata/{channel-unix-source-path-inactive.x86_64-=
latest.xml =3D> channel-unix-source-path.x86_64-latest.xml} (100%)
 delete mode 100644 tests/qemuxml2xmloutdata/channel-virtio-state-active.x8=
6_64-latest.xml
 rename tests/qemuxml2xmloutdata/{channel-virtio-state-inactive.x86_64-late=
st.xml =3D> channel-virtio-state.x86_64-latest.xml} (100%)
 delete mode 100644 tests/qemuxml2xmloutdata/disk-active-commit-active.x86_=
64-latest.xml
 rename tests/qemuxml2xmloutdata/{disk-active-commit-inactive.x86_64-latest=
.xml =3D> disk-active-commit.x86_64-latest.xml} (100%)
 delete mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-index-acti=
ve.x86_64-latest.xml
 rename tests/qemuxml2xmloutdata/{disk-backing-chains-index-inactive.x86_64=
-latest.xml =3D> disk-backing-chains-index.x86_64-latest.xml} (100%)
 delete mode 100644 tests/qemuxml2xmloutdata/disk-mirror-active.x86_64-late=
st.xml
 delete mode 100644 tests/qemuxml2xmloutdata/disk-mirror-old-active.x86_64-=
latest.xml
 rename tests/qemuxml2xmloutdata/{disk-mirror-old-inactive.x86_64-latest.xm=
l =3D> disk-mirror-old.x86_64-latest.xml} (100%)
 rename tests/qemuxml2xmloutdata/{disk-mirror-inactive.x86_64-latest.xml =
=3D> disk-mirror.x86_64-latest.xml} (100%)
 delete mode 100644 tests/qemuxml2xmloutdata/genid-active.x86_64-latest.xml
 delete mode 100644 tests/qemuxml2xmloutdata/genid-auto-active.x86_64-lates=
t.xml
 rename tests/qemuxml2xmloutdata/{genid-auto-inactive.x86_64-latest.xml =3D=
> genid-auto.x86_64-latest.xml} (100%)
 rename tests/qemuxml2xmloutdata/{genid-inactive.x86_64-latest.xml =3D> gen=
id.x86_64-latest.xml} (100%)
 delete mode 100644 tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-=
socket-active.x86_64-latest.xml
 rename tests/qemuxml2xmloutdata/{graphics-vnc-remove-generated-socket-inac=
tive.x86_64-latest.xml =3D> graphics-vnc-remove-generated-socket.x86_64-lat=
est.xml} (100%)
 rename tests/qemuxml2xmloutdata/{seclabel-dynamic-baselabel-inactive.x86_6=
4-latest.xml =3D> seclabel-dynamic-baselabel.x86_64-latest.xml} (100%)
 rename tests/qemuxml2xmloutdata/{seclabel-dynamic-labelskip-inactive.x86_6=
4-latest.xml =3D> seclabel-dynamic-labelskip.x86_64-latest.xml} (100%)
 rename tests/qemuxml2xmloutdata/{seclabel-dynamic-none-relabel-inactive.x8=
6_64-latest.xml =3D> seclabel-dynamic-none-relabel.x86_64-latest.xml} (100%)
 rename tests/qemuxml2xmloutdata/{seclabel-dynamic-override-inactive.x86_64=
-latest.xml =3D> seclabel-dynamic-override.x86_64-latest.xml} (100%)
 rename tests/qemuxml2xmloutdata/{seclabel-dynamic-relabel-inactive.x86_64-=
latest.xml =3D> seclabel-dynamic-relabel.x86_64-latest.xml} (100%)
 delete mode 100644 tests/qemuxml2xmloutdata/seclabel-static-labelskip-acti=
ve.x86_64-latest.xml
 rename tests/qemuxml2xmloutdata/{seclabel-static-labelskip-inactive.x86_64=
-latest.xml =3D> seclabel-static-labelskip.x86_64-latest.xml} (100%)

diff --git a/tests/qemuxml2xmloutdata/channel-unix-source-path-active.x86_6=
4-latest.xml b/tests/qemuxml2xmloutdata/channel-unix-source-path-active.x86=
_64-latest.xml
deleted file mode 100644
index 022ad7025a..0000000000
--- a/tests/qemuxml2xmloutdata/channel-unix-source-path-active.x86_64-lates=
t.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<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/qemuxml2xmloutdata/channel-unix-source-path-inactive.x86=
_64-latest.xml b/tests/qemuxml2xmloutdata/channel-unix-source-path.x86_64-l=
atest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.x86_=
64-latest.xml
rename to tests/qemuxml2xmloutdata/channel-unix-source-path.x86_64-latest.x=
ml
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-active.x86_64-la=
test.xml b/tests/qemuxml2xmloutdata/channel-virtio-state-active.x86_64-late=
st.xml
deleted file mode 100644
index a4ffae81e8..0000000000
--- a/tests/qemuxml2xmloutdata/channel-virtio-state-active.x86_64-latest.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<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/qemuxml2xmloutdata/channel-virtio-state-inactive.x86_64-=
latest.xml b/tests/qemuxml2xmloutdata/channel-virtio-state.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/channel-virtio-state-inactive.x86_64-l=
atest.xml
rename to tests/qemuxml2xmloutdata/channel-virtio-state.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-active-commit-active.x86_64-late=
st.xml b/tests/qemuxml2xmloutdata/disk-active-commit-active.x86_64-latest.x=
ml
deleted file mode 100644
index cbe47150a9..0000000000
--- a/tests/qemuxml2xmloutdata/disk-active-commit-active.x86_64-latest.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<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/qemuxml2xmloutdata/disk-active-commit-inactive.x86_64-la=
test.xml b/tests/qemuxml2xmloutdata/disk-active-commit.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-active-commit-inactive.x86_64-lat=
est.xml
rename to tests/qemuxml2xmloutdata/disk-active-commit.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.x86_=
64-latest.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.x=
86_64-latest.xml
deleted file mode 100644
index 52c8ad6f29..0000000000
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.x86_64-late=
st.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<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/qemuxml2xmloutdata/disk-backing-chains-index-inactive.x8=
6_64-latest.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-index.x86_64=
-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.x86=
_64-latest.xml
rename to tests/qemuxml2xmloutdata/disk-backing-chains-index.x86_64-latest.=
xml
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-active.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/disk-mirror-active.x86_64-latest.xml
deleted file mode 100644
index 0cd61afa5c..0000000000
--- a/tests/qemuxml2xmloutdata/disk-mirror-active.x86_64-latest.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<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/qemuxml2xmloutdata/disk-mirror-old-active.x86_64-latest.=
xml b/tests/qemuxml2xmloutdata/disk-mirror-old-active.x86_64-latest.xml
deleted file mode 100644
index 0732cf9e9c..0000000000
--- a/tests/qemuxml2xmloutdata/disk-mirror-old-active.x86_64-latest.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<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/qemuxml2xmloutdata/disk-mirror-old-inactive.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/disk-mirror-old.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-mirror-old-inactive.x86_64-latest=
.xml
rename to tests/qemuxml2xmloutdata/disk-mirror-old.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-inactive.x86_64-latest.xm=
l b/tests/qemuxml2xmloutdata/disk-mirror.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-mirror-inactive.x86_64-latest.xml
rename to tests/qemuxml2xmloutdata/disk-mirror.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/genid-active.x86_64-latest.xml b/test=
s/qemuxml2xmloutdata/genid-active.x86_64-latest.xml
deleted file mode 100644
index 06a01bb688..0000000000
--- a/tests/qemuxml2xmloutdata/genid-active.x86_64-latest.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<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/qemuxml2xmloutdata/genid-auto-active.x86_64-latest.xml b=
/tests/qemuxml2xmloutdata/genid-auto-active.x86_64-latest.xml
deleted file mode 100644
index ce3af24282..0000000000
--- a/tests/qemuxml2xmloutdata/genid-auto-active.x86_64-latest.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<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/qemuxml2xmloutdata/genid-auto-inactive.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/genid-auto.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/genid-auto-inactive.x86_64-latest.xml
rename to tests/qemuxml2xmloutdata/genid-auto.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/genid-inactive.x86_64-latest.xml b/te=
sts/qemuxml2xmloutdata/genid.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/genid-inactive.x86_64-latest.xml
rename to tests/qemuxml2xmloutdata/genid.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-=
active.x86_64-latest.xml b/tests/qemuxml2xmloutdata/graphics-vnc-remove-gen=
erated-socket-active.x86_64-latest.xml
deleted file mode 100644
index f61470a339..0000000000
--- a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.=
x86_64-latest.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<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/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-=
inactive.x86_64-latest.xml b/tests/qemuxml2xmloutdata/graphics-vnc-remove-g=
enerated-socket.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-i=
nactive.x86_64-latest.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket.x86=
_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.x=
86_64-latest.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.x86_=
64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.x8=
6_64-latest.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.x86_64-latest=
.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.x=
86_64-latest.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.x86_=
64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.x8=
6_64-latest.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.x86_64-latest=
.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactiv=
e.x86_64-latest.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabe=
l.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive=
.x86_64-latest.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel.x86_64-lat=
est.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.x8=
6_64-latest.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-override.x86_64=
-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.x86=
_64-latest.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-override.x86_64-latest.=
xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.x86=
_64-latest.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.x86_64-l=
atest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.x86_=
64-latest.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.x86_64-latest.x=
ml
diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.x86_=
64-latest.xml b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.x=
86_64-latest.xml
deleted file mode 100644
index 986bf3db4e..0000000000
--- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.x86_64-late=
st.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<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/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.x8=
6_64-latest.xml b/tests/qemuxml2xmloutdata/seclabel-static-labelskip.x86_64=
-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.x86=
_64-latest.xml
rename to tests/qemuxml2xmloutdata/seclabel-static-labelskip.x86_64-latest.=
xml
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 2e384e76aa..1b534aa8d0 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -45,7 +45,7 @@ testXML2XMLActive(const void *opaque)
     if (testXML2XMLCommon(info) < 0 ||
         testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt,
                                    info->infile, info->outfile, true,
-                                   info->parseFlags,
+                                   info->parseFlags | VIR_DOMAIN_DEF_PARSE=
_INACTIVE,
                                    TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS=
) < 0) {
         return -1;
     }
@@ -62,7 +62,7 @@ testXML2XMLInactive(const void *opaque)
     if (testXML2XMLCommon(info) < 0 ||
         testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt,
                                    info->infile, info->outfile, false,
-                                   info->parseFlags,
+                                   info->parseFlags | VIR_DOMAIN_DEF_PARSE=
_INACTIVE,
                                    TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS=
) < 0) {
         return -1;
     }
@@ -71,42 +71,6 @@ testXML2XMLInactive(const void *opaque)
 }


-/**
- * testInfoSetPaths:
- * @info: test info structure to populate
- * @suffix: suffix used to create output file name e.g. ".x86-64_latest"
- * @statesuffix: suffix to create output file name based on tested state (=
"active" | "inactive")
- *
- * This function populates @info with the correct input and output file pa=
ths.
- *
- * The output file is chosen based on whether a version with @statesuffix =
exists.
- * If yes, it's used, if no the @statesuffix is omitted and it's expected =
that
- * both the "active" and "inactive" versions are the same.
- */
-static void
-testInfoSetPaths(testQemuInfo *info,
-                 const char *suffix,
-                 const char *statesuffix)
-{
-    VIR_FREE(info->infile);
-    VIR_FREE(info->outfile);
-
-    info->infile =3D g_strdup_printf("%s/qemuxml2argvdata/%s.xml", abs_src=
dir,
-                                   info->name);
-
-    info->outfile =3D g_strdup_printf("%s/qemuxml2xmloutdata/%s-%s%s.xml",
-                                    abs_srcdir, info->name,
-                                    statesuffix, suffix);
-
-    if (!virFileExists(info->outfile)) {
-        VIR_FREE(info->outfile);
-
-        info->outfile =3D g_strdup_printf("%s/qemuxml2xmloutdata/%s%s.xml",
-                                        abs_srcdir, info->name, suffix);
-    }
-}
-
-
 static void
 testRun(const char *name,
         const char *suffix,
@@ -126,11 +90,12 @@ testRun(const char *name,
     testQemuInfoSetArgs(info, ap);
     va_end(ap);

+    info->infile =3D g_strdup_printf("%s/qemuxml2argvdata/%s.xml", abs_src=
dir,
+                                   info->name);
+    info->outfile =3D g_strdup_printf("%s/qemuxml2xmloutdata/%s%s.xml",
+                                    abs_srcdir, info->name, suffix);

-    testInfoSetPaths(info, suffix, "inactive");
     virTestRunLog(ret, name_inactive, testXML2XMLInactive, info);
-
-    testInfoSetPaths(info, suffix, "active");
     virTestRunLog(ret, name_active, testXML2XMLActive, info);
 }

--=20
2.43.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org