From nobody Thu Sep 19 00:15:18 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates
 8.43.85.245 as permitted sender) client-ip=8.43.85.245;
 envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as
 permitted sender)  smtp.mailfrom=devel-bounces@lists.libvirt.org;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1719834351; cv=none;
	d=zohomail.com; s=zohoarc;
	b=NhMFdp6DGzISJ49aCdgd9dCN8rU3hoG5gZGypfuEiK0tyfrf5IEbP7mTRLP8OosPMZLfhhPkq4+dwbyRfF3DS+Ni0CyCZEw4vLdmQQaC2JiYYn39SU+3kzx68Nik6/DgCBHELP+ONDB4kDfm1+F1x68V4pVBdQ9Rl1PuXtLDBAM=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1719834351;
 h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To:Cc;
	bh=lQn6aQ5FE9Bdc2geW0IKmvxuGkSIwUW/Q0wz+OLPxdU=;
	b=fXMzOi5krkLceB5KTAydR6Zyb380xIXElPVWjGcgC2W8mInLSvoTzxT/BtOTTFwcN0GhprzA/jy83pNWcyBGo97T6zWNlOkGBWC47VFqLjAq8+IV6W4IYJ7rolXFRaiPG2PaYidHdiAKsw2J+RCDLjhSMAbeWlQ9BRtEmqdRzHE=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as
 permitted sender)  smtp.mailfrom=devel-bounces@lists.libvirt.org;
	dmarc=pass header.from=<mprivozn@redhat.com> (p=none dis=none)
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 1719834351336902.3236588457805;
 Mon, 1 Jul 2024 04:45:51 -0700 (PDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id B5CE01481; Mon,  1 Jul 2024 07:45:48 -0400 (EDT)
Received: from lists.libvirt.org (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id AA2B814BE;
	Mon,  1 Jul 2024 07:42:11 -0400 (EDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 136A4137E; Mon,  1 Jul 2024 07:42:06 -0400 (EDT)
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 5307613FD
	for <devel@lists.libvirt.org>; Mon,  1 Jul 2024 07:41:57 -0400 (EDT)
Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com
 (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by
 relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
 cipher=TLS_AES_256_GCM_SHA384) id us-mta-681-XjUDgxrMM0SW67uZQVdHVg-1; Mon,
 01 Jul 2024 07:41:53 -0400
Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com
 (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15])
	(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 mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
 id B17761944D26
	for <devel@lists.libvirt.org>; Mon,  1 Jul 2024 11:41:51 +0000 (UTC)
Received: from maggie.brq.redhat.com (unknown [10.43.3.102])
	by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
 id 0398D19773FA
	for <devel@lists.libvirt.org>; Mon,  1 Jul 2024 11:41:49 +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=-1.1 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,
	RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable
	autolearn_force=no version=3.4.4
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1719834116;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references;
	bh=lQn6aQ5FE9Bdc2geW0IKmvxuGkSIwUW/Q0wz+OLPxdU=;
	b=NM2YmmTcweEROcDCyN6HRNCc+LiOQKsXo9yrpyfYwuqoTDWS/bidI4oGcDUq7D3245lmRO
	YiXmbGnlO5FhDUXIQK9eXDModWvYiWaMqjIdFzDSNhF6U5ScT+LnwRC0X7sRUIlSwQX2Ck
	X4g2oCkLbky6Ape2TNXSIfNtgRhxTpw=
X-MC-Unique: XjUDgxrMM0SW67uZQVdHVg-1
From: Michal Privoznik <mprivozn@redhat.com>
To: devel@lists.libvirt.org
Subject: [PATCH 3/9] qemuxmlconfdata: Drop tests relying on <qemu-5.2.0
Date: Mon,  1 Jul 2024 13:41:37 +0200
Message-ID: 
 <428e5bbd1d34c52d39aafd6a4f19bba04bd923fb.1719834072.git.mprivozn@redhat.com>
In-Reply-To: <cover.1719834072.git.mprivozn@redhat.com>
References: <cover.1719834072.git.mprivozn@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Message-ID-Hash: QHEWQ4OTZ5PM5KXKNGUYVMV5RHAT4KK4
X-Message-ID-Hash: QHEWQ4OTZ5PM5KXKNGUYVMV5RHAT4KK4
X-MailFrom: mprivozn@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/QHEWQ4OTZ5PM5KXKNGUYVMV5RHAT4KK4/>
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>
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1719834352863100001
Content-Type: text/plain; charset="utf-8"; x-default="true"

Soon, the minimal version of QEMU is going to be bumped to 5.2.0.
Drop test cases that require older version.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---
 .../aarch64-gic-default.aarch64-4.2.0.args    |  31 ----
 .../aarch64-gic-default.aarch64-4.2.0.xml     |  26 ---
 .../aarch64-gic-none.aarch64-4.2.0.args       |  31 ----
 .../aarch64-gic-none.aarch64-4.2.0.xml        |  26 ---
 .../aarch64-virt-virtio.aarch64-4.2.0.args    |  54 ------
 .../aarch64-virt-virtio.aarch64-4.2.0.xml     |  94 -----------
 .../audio-default-sdl.x86_64-4.2.0.args       |  37 ----
 .../audio-default-sdl.x86_64-4.2.0.xml        |  44 -----
 .../audio-default-spice.x86_64-4.2.0.args     |  36 ----
 .../audio-default-spice.x86_64-4.2.0.xml      |  46 -----
 .../audio-default-vnc.x86_64-4.2.0.args       |  36 ----
 .../audio-default-vnc.x86_64-4.2.0.xml        |  46 -----
 ...-host-model-fallback-kvm.x86_64-4.2.0.args |  33 ----
 ...u-host-model-fallback-kvm.x86_64-4.2.0.xml |  29 ----
 ...-host-model-fallback-kvm.x86_64-5.0.0.args |  33 ----
 ...u-host-model-fallback-kvm.x86_64-5.0.0.xml |  29 ----
 ...-host-model-fallback-kvm.x86_64-5.1.0.args |  33 ----
 ...u-host-model-fallback-kvm.x86_64-5.1.0.xml |  29 ----
 ...-host-model-fallback-tcg.x86_64-4.2.0.args |  33 ----
 ...u-host-model-fallback-tcg.x86_64-4.2.0.xml |  29 ----
 ...-host-model-fallback-tcg.x86_64-5.0.0.args |  33 ----
 ...u-host-model-fallback-tcg.x86_64-5.0.0.xml |  29 ----
 ...-host-model-fallback-tcg.x86_64-5.1.0.args |  33 ----
 ...u-host-model-fallback-tcg.x86_64-5.1.0.xml |  29 ----
 .../cpu-host-model-kvm.x86_64-4.2.0.args      |  38 -----
 .../cpu-host-model-kvm.x86_64-4.2.0.xml       |  48 ------
 .../cpu-host-model-kvm.x86_64-5.0.0.args      |  38 -----
 .../cpu-host-model-kvm.x86_64-5.0.0.xml       |  48 ------
 .../cpu-host-model-kvm.x86_64-5.1.0.args      |  38 -----
 .../cpu-host-model-kvm.x86_64-5.1.0.xml       |  48 ------
 ...ost-model-nofallback-kvm.x86_64-4.2.0.args |  33 ----
 ...host-model-nofallback-kvm.x86_64-4.2.0.xml |  29 ----
 ...ost-model-nofallback-kvm.x86_64-5.0.0.args |  33 ----
 ...host-model-nofallback-kvm.x86_64-5.0.0.xml |  29 ----
 ...ost-model-nofallback-kvm.x86_64-5.1.0.args |  33 ----
 ...host-model-nofallback-kvm.x86_64-5.1.0.xml |  29 ----
 ...ost-model-nofallback-tcg.x86_64-4.2.0.args |  33 ----
 ...host-model-nofallback-tcg.x86_64-4.2.0.xml |  29 ----
 ...ost-model-nofallback-tcg.x86_64-5.0.0.args |  33 ----
 ...host-model-nofallback-tcg.x86_64-5.0.0.xml |  29 ----
 ...ost-model-nofallback-tcg.x86_64-5.1.0.args |  33 ----
 ...host-model-nofallback-tcg.x86_64-5.1.0.xml |  29 ----
 .../cpu-host-model-tcg.x86_64-4.2.0.args      |  38 -----
 .../cpu-host-model-tcg.x86_64-4.2.0.xml       |  48 ------
 .../cpu-host-model-tcg.x86_64-5.0.0.args      |  38 -----
 .../cpu-host-model-tcg.x86_64-5.0.0.xml       |  48 ------
 .../cpu-host-model-tcg.x86_64-5.1.0.args      |  38 -----
 .../cpu-host-model-tcg.x86_64-5.1.0.xml       |  48 ------
 ...isk-network-tlsx509-vxhs.x86_64-5.0.0.args |  45 -----
 ...disk-network-tlsx509-vxhs.x86_64-5.0.0.xml |  56 -------
 .../disk-network-tlsx509-vxhs.xml             |  50 ------
 .../disk-network-vxhs.x86_64-5.0.0.args       |  35 ----
 .../disk-network-vxhs.x86_64-5.0.0.xml        |  38 -----
 tests/qemuxmlconfdata/disk-network-vxhs.xml   |  32 ----
 .../disk-vhostuser-numa.x86_64-4.2.0.args     |  39 -----
 .../disk-vhostuser-numa.x86_64-4.2.0.xml      |  48 ------
 .../fips-enabled.x86_64-5.1.0.args            |  37 ----
 .../fips-enabled.x86_64-5.1.0.xml             |  40 -----
 ...dev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args |  36 ----
 ...tdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.xml |  45 -----
 .../hugepages-memaccess3.x86_64-5.1.0.err     |   1 -
 ...iothreads-disk-virtio-ccw.s390x-4.2.0.args |  39 -----
 .../iothreads-disk-virtio-ccw.s390x-4.2.0.xml |  41 -----
 .../iothreads-disk-virtio-ccw.xml             |  34 ----
 ...acpi-root-hotplug-disable.x86_64-5.1.0.err |   1 -
 ...-acpi-root-hotplug-enable.x86_64-5.1.0.err |   1 -
 .../pseries-features.ppc64-4.2.0.args         |  30 ----
 .../pseries-features.ppc64-4.2.0.xml          |  40 -----
 ...q35-default-devices-only.x86_64-4.2.0.args |  38 -----
 .../q35-default-devices-only.x86_64-4.2.0.xml |  50 ------
 .../q35-multifunction.x86_64-4.2.0.args       |  53 ------
 .../q35-multifunction.x86_64-4.2.0.xml        | 125 --------------
 .../q35-pcie-autoadd.x86_64-4.2.0.args        |  67 --------
 .../q35-pcie-autoadd.x86_64-4.2.0.xml         | 154 -----------------
 .../q35-pcie.x86_64-4.2.0.args                |  68 --------
 .../qemuxmlconfdata/q35-pcie.x86_64-4.2.0.xml | 158 ------------------
 .../q35-virt-manager-basic.x86_64-4.2.0.args  |  63 -------
 .../q35-virt-manager-basic.x86_64-4.2.0.xml   | 128 --------------
 .../sound-device.x86_64-4.2.0.args            |  49 ------
 .../sound-device.x86_64-4.2.0.xml             |  61 -------
 ...alloon-freepage-reporting.x86_64-5.0.0.err |   1 -
 tests/qemuxmlconftest.c                       |  45 -----
 82 files changed, 3515 deletions(-)
 delete mode 100644 tests/qemuxmlconfdata/aarch64-gic-default.aarch64-4.2.0=
.args
 delete mode 100644 tests/qemuxmlconfdata/aarch64-gic-default.aarch64-4.2.0=
.xml
 delete mode 100644 tests/qemuxmlconfdata/aarch64-gic-none.aarch64-4.2.0.ar=
gs
 delete mode 100644 tests/qemuxmlconfdata/aarch64-gic-none.aarch64-4.2.0.xml
 delete mode 100644 tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-4.2.0=
.args
 delete mode 100644 tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-4.2.0=
.xml
 delete mode 100644 tests/qemuxmlconfdata/audio-default-sdl.x86_64-4.2.0.ar=
gs
 delete mode 100644 tests/qemuxmlconfdata/audio-default-sdl.x86_64-4.2.0.xml
 delete mode 100644 tests/qemuxmlconfdata/audio-default-spice.x86_64-4.2.0.=
args
 delete mode 100644 tests/qemuxmlconfdata/audio-default-spice.x86_64-4.2.0.=
xml
 delete mode 100644 tests/qemuxmlconfdata/audio-default-vnc.x86_64-4.2.0.ar=
gs
 delete mode 100644 tests/qemuxmlconfdata/audio-default-vnc.x86_64-4.2.0.xml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6=
4-4.2.0.args
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6=
4-4.2.0.xml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6=
4-5.0.0.args
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6=
4-5.0.0.xml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6=
4-5.1.0.args
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6=
4-5.1.0.xml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6=
4-4.2.0.args
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6=
4-4.2.0.xml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6=
4-5.0.0.args
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6=
4-5.0.0.xml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6=
4-5.1.0.args
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6=
4-5.1.0.xml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.a=
rgs
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.x=
ml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.a=
rgs
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.x=
ml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.1.0.a=
rgs
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.1.0.x=
ml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86=
_64-4.2.0.args
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86=
_64-4.2.0.xml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86=
_64-5.0.0.args
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86=
_64-5.0.0.xml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86=
_64-5.1.0.args
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86=
_64-5.1.0.xml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86=
_64-4.2.0.args
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86=
_64-4.2.0.xml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86=
_64-5.0.0.args
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86=
_64-5.0.0.xml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86=
_64-5.1.0.args
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86=
_64-5.1.0.xml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.a=
rgs
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.x=
ml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.a=
rgs
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.x=
ml
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.a=
rgs
 delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.x=
ml
 delete mode 100644 tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.x86_64-=
5.0.0.args
 delete mode 100644 tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.x86_64-=
5.0.0.xml
 delete mode 100644 tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.xml
 delete mode 100644 tests/qemuxmlconfdata/disk-network-vxhs.x86_64-5.0.0.ar=
gs
 delete mode 100644 tests/qemuxmlconfdata/disk-network-vxhs.x86_64-5.0.0.xml
 delete mode 100644 tests/qemuxmlconfdata/disk-network-vxhs.xml
 delete mode 100644 tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.=
args
 delete mode 100644 tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.=
xml
 delete mode 100644 tests/qemuxmlconfdata/fips-enabled.x86_64-5.1.0.args
 delete mode 100644 tests/qemuxmlconfdata/fips-enabled.x86_64-5.1.0.xml
 delete mode 100644 tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_=
64-4.2.0.args
 delete mode 100644 tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_=
64-4.2.0.xml
 delete mode 100644 tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-5.1.0=
.err
 delete mode 100644 tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.s390x-4=
.2.0.args
 delete mode 100644 tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.s390x-4=
.2.0.xml
 delete mode 100644 tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.xml
 delete mode 100644 tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disab=
le.x86_64-5.1.0.err
 delete mode 100644 tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enabl=
e.x86_64-5.1.0.err
 delete mode 100644 tests/qemuxmlconfdata/pseries-features.ppc64-4.2.0.args
 delete mode 100644 tests/qemuxmlconfdata/pseries-features.ppc64-4.2.0.xml
 delete mode 100644 tests/qemuxmlconfdata/q35-default-devices-only.x86_64-4=
.2.0.args
 delete mode 100644 tests/qemuxmlconfdata/q35-default-devices-only.x86_64-4=
.2.0.xml
 delete mode 100644 tests/qemuxmlconfdata/q35-multifunction.x86_64-4.2.0.ar=
gs
 delete mode 100644 tests/qemuxmlconfdata/q35-multifunction.x86_64-4.2.0.xml
 delete mode 100644 tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-4.2.0.args
 delete mode 100644 tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-4.2.0.xml
 delete mode 100644 tests/qemuxmlconfdata/q35-pcie.x86_64-4.2.0.args
 delete mode 100644 tests/qemuxmlconfdata/q35-pcie.x86_64-4.2.0.xml
 delete mode 100644 tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-4.2=
.0.args
 delete mode 100644 tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-4.2=
.0.xml
 delete mode 100644 tests/qemuxmlconfdata/sound-device.x86_64-4.2.0.args
 delete mode 100644 tests/qemuxmlconfdata/sound-device.x86_64-4.2.0.xml
 delete mode 100644 tests/qemuxmlconfdata/virtio-options-memballoon-freepag=
e-reporting.x86_64-5.0.0.err

diff --git a/tests/qemuxmlconfdata/aarch64-gic-default.aarch64-4.2.0.args b=
/tests/qemuxmlconfdata/aarch64-gic-default.aarch64-4.2.0.args
deleted file mode 100644
index df401b979d..0000000000
--- a/tests/qemuxmlconfdata/aarch64-gic-default.aarch64-4.2.0.args
+++ /dev/null
@@ -1,31 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
-/usr/bin/qemu-system-aarch64 \
--name guest=3Daarch64test,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-aarch64test/master-key.aes \
--machine virt-4.2,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff \
--accel kvm \
--cpu host \
--m size=3D1048576k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--audiodev '{"id":"audio1","driver":"none"}' \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/aarch64-gic-default.aarch64-4.2.0.xml b/=
tests/qemuxmlconfdata/aarch64-gic-default.aarch64-4.2.0.xml
deleted file mode 100644
index ebaddc66f2..0000000000
--- a/tests/qemuxmlconfdata/aarch64-gic-default.aarch64-4.2.0.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<domain type=3D'kvm'>
-  <name>aarch64test</name>
-  <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
-  <memory unit=3D'KiB'>1048576</memory>
-  <currentMemory unit=3D'KiB'>1048576</currentMemory>
-  <vcpu placement=3D'static'>1</vcpu>
-  <os>
-    <type arch=3D'aarch64' machine=3D'virt-4.2'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <features>
-    <gic version=3D'3'/>
-  </features>
-  <cpu mode=3D'host-passthrough' check=3D'none'/>
-  <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-aarch64</emulator>
-    <controller type=3D'usb' index=3D'0' model=3D'none'/>
-    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <audio id=3D'1' type=3D'none'/>
-    <memballoon model=3D'none'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/aarch64-gic-none.aarch64-4.2.0.args b/te=
sts/qemuxmlconfdata/aarch64-gic-none.aarch64-4.2.0.args
deleted file mode 100644
index df401b979d..0000000000
--- a/tests/qemuxmlconfdata/aarch64-gic-none.aarch64-4.2.0.args
+++ /dev/null
@@ -1,31 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
-/usr/bin/qemu-system-aarch64 \
--name guest=3Daarch64test,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-aarch64test/master-key.aes \
--machine virt-4.2,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff \
--accel kvm \
--cpu host \
--m size=3D1048576k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--audiodev '{"id":"audio1","driver":"none"}' \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/aarch64-gic-none.aarch64-4.2.0.xml b/tes=
ts/qemuxmlconfdata/aarch64-gic-none.aarch64-4.2.0.xml
deleted file mode 100644
index ebaddc66f2..0000000000
--- a/tests/qemuxmlconfdata/aarch64-gic-none.aarch64-4.2.0.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<domain type=3D'kvm'>
-  <name>aarch64test</name>
-  <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
-  <memory unit=3D'KiB'>1048576</memory>
-  <currentMemory unit=3D'KiB'>1048576</currentMemory>
-  <vcpu placement=3D'static'>1</vcpu>
-  <os>
-    <type arch=3D'aarch64' machine=3D'virt-4.2'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <features>
-    <gic version=3D'3'/>
-  </features>
-  <cpu mode=3D'host-passthrough' check=3D'none'/>
-  <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-aarch64</emulator>
-    <controller type=3D'usb' index=3D'0' model=3D'none'/>
-    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <audio id=3D'1' type=3D'none'/>
-    <memballoon model=3D'none'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-4.2.0.args b=
/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-4.2.0.args
deleted file mode 100644
index 3ee2bcd93b..0000000000
--- a/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-4.2.0.args
+++ /dev/null
@@ -1,54 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
-/usr/bin/qemu-system-aarch64 \
--name guest=3Daarch64test,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-aarch64test/master-key.aes \
--machine virt-4.2,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \
--accel tcg \
--cpu cortex-a53 \
--m size=3D1048576k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--kernel /aarch64.kernel \
--initrd /aarch64.initrd \
--append 'earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwai=
t' \
--dtb /aarch64.dtb \
--device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
--device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
--device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
--device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=
=3D0x1.0x3 \
--device pcie-root-port,port=3D12,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr=
=3D0x1.0x4 \
--device pcie-root-port,port=3D13,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr=
=3D0x1.0x5 \
--device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.2,addr=3D0x0 \
--blockdev '{"driver":"file","filename":"/aarch64.raw","node-name":"libvirt=
-1-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw=
","file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=3Doff,bus=3Dpci.3,addr=3D0x0,drive=3Dlibvirt-1=
-format,id=3Dvirtio-disk0,bootindex=3D1 \
--netdev user,id=3Dhostnet0 \
--device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37=
,bus=3Dpci.1,addr=3D0x0 \
--chardev pty,id=3Dcharserial0 \
--serial chardev:charserial0 \
--chardev pty,id=3Dcharconsole1 \
--device virtconsole,chardev=3Dcharconsole1,id=3Dconsole1 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.4,addr=3D0x0 \
--object rng-random,id=3Dobjrng0,filename=3D/dev/random \
--device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.5,addr=3D0x0 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-4.2.0.xml b/=
tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-4.2.0.xml
deleted file mode 100644
index 3c657b4c91..0000000000
--- a/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-4.2.0.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<domain type=3D'qemu'>
-  <name>aarch64test</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
-  <memory unit=3D'KiB'>1048576</memory>
-  <currentMemory unit=3D'KiB'>1048576</currentMemory>
-  <vcpu placement=3D'static'>1</vcpu>
-  <os>
-    <type arch=3D'aarch64' machine=3D'virt-4.2'>hvm</type>
-    <kernel>/aarch64.kernel</kernel>
-    <initrd>/aarch64.initrd</initrd>
-    <cmdline>earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda roo=
twait</cmdline>
-    <dtb>/aarch64.dtb</dtb>
-    <boot dev=3D'hd'/>
-  </os>
-  <features>
-    <apic/>
-    <pae/>
-    <gic version=3D'2'/>
-  </features>
-  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
-    <model fallback=3D'allow'>cortex-a53</model>
-  </cpu>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-aarch64</emulator>
-    <disk type=3D'file' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'raw'/>
-      <source file=3D'/aarch64.raw'/>
-      <target dev=3D'vda' bus=3D'virtio'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </disk>
-    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'1' port=3D'0x8'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'2' port=3D'0x9'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'3' port=3D'0xa'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'4' port=3D'0xb'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x3'/>
-    </controller>
-    <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'5' port=3D'0xc'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x4'/>
-    </controller>
-    <controller type=3D'pci' index=3D'6' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'6' port=3D'0xd'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x5'/>
-    </controller>
-    <controller type=3D'virtio-serial' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <interface type=3D'user'>
-      <mac address=3D'52:54:00:09:a4:37'/>
-      <model type=3D'virtio'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </interface>
-    <serial type=3D'pty'>
-      <target type=3D'system-serial' port=3D'0'>
-        <model name=3D'pl011'/>
-      </target>
-    </serial>
-    <console type=3D'pty'>
-      <target type=3D'serial' port=3D'0'/>
-    </console>
-    <console type=3D'pty'>
-      <target type=3D'virtio' port=3D'1'/>
-    </console>
-    <audio id=3D'1' type=3D'none'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </memballoon>
-    <rng model=3D'virtio'>
-      <backend model=3D'random'>/dev/random</backend>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </rng>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/audio-default-sdl.x86_64-4.2.0.args b/te=
sts/qemuxmlconfdata/audio-default-sdl.x86_64-4.2.0.args
deleted file mode 100644
index 682b813d4f..0000000000
--- a/tests/qemuxmlconfdata/audio-default-sdl.x86_64-4.2.0.args
+++ /dev/null
@@ -1,37 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-SDL_AUDIODRIVER=3Desd \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu qemu64 \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib=
virt-1-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"=
,"file":"libvirt-1-storage"}' \
--device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0=
,bootindex=3D1 \
--audiodev '{"id":"audio1","driver":"sdl"}' \
--display sdl \
--device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/audio-default-sdl.x86_64-4.2.0.xml b/tes=
ts/qemuxmlconfdata/audio-default-sdl.x86_64-4.2.0.xml
deleted file mode 100644
index ebd69b43c8..0000000000
--- a/tests/qemuxmlconfdata/audio-default-sdl.x86_64-4.2.0.xml
+++ /dev/null
@@ -1,44 +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-i440fx-4.2'>hvm</type>
-    <boot dev=3D'cdrom'/>
-  </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'cdrom'>
-      <driver name=3D'qemu' type=3D'raw'/>
-      <source dev=3D'/dev/cdrom'/>
-      <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>
-    <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'sdl'/>
-    <audio id=3D'1' type=3D'sdl' driver=3D'esd'/>
-    <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/qemuxmlconfdata/audio-default-spice.x86_64-4.2.0.args b/=
tests/qemuxmlconfdata/audio-default-spice.x86_64-4.2.0.args
deleted file mode 100644
index 659138d7e8..0000000000
--- a/tests/qemuxmlconfdata/audio-default-spice.x86_64-4.2.0.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu qemu64 \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib=
virt-1-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"=
,"file":"libvirt-1-storage"}' \
--device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0=
,bootindex=3D1 \
--audiodev '{"id":"audio1","driver":"spice"}' \
--spice port=3D0,seamless-migration=3Don \
--device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/audio-default-spice.x86_64-4.2.0.xml b/t=
ests/qemuxmlconfdata/audio-default-spice.x86_64-4.2.0.xml
deleted file mode 100644
index 70f1658cd4..0000000000
--- a/tests/qemuxmlconfdata/audio-default-spice.x86_64-4.2.0.xml
+++ /dev/null
@@ -1,46 +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-i440fx-4.2'>hvm</type>
-    <boot dev=3D'cdrom'/>
-  </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'cdrom'>
-      <driver name=3D'qemu' type=3D'raw'/>
-      <source dev=3D'/dev/cdrom'/>
-      <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>
-    <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'spice'>
-      <listen type=3D'none'/>
-    </graphics>
-    <audio id=3D'1' type=3D'spice'/>
-    <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/qemuxmlconfdata/audio-default-vnc.x86_64-4.2.0.args b/te=
sts/qemuxmlconfdata/audio-default-vnc.x86_64-4.2.0.args
deleted file mode 100644
index 5aea227060..0000000000
--- a/tests/qemuxmlconfdata/audio-default-vnc.x86_64-4.2.0.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu qemu64 \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib=
virt-1-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"=
,"file":"libvirt-1-storage"}' \
--device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0=
,bootindex=3D1 \
--audiodev '{"id":"audio1","driver":"alsa"}' \
--vnc 127.0.0.1:0,audiodev=3Daudio1 \
--device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/audio-default-vnc.x86_64-4.2.0.xml b/tes=
ts/qemuxmlconfdata/audio-default-vnc.x86_64-4.2.0.xml
deleted file mode 100644
index 613fd40ea1..0000000000
--- a/tests/qemuxmlconfdata/audio-default-vnc.x86_64-4.2.0.xml
+++ /dev/null
@@ -1,46 +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-i440fx-4.2'>hvm</type>
-    <boot dev=3D'cdrom'/>
-  </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'cdrom'>
-      <driver name=3D'qemu' type=3D'raw'/>
-      <source dev=3D'/dev/cdrom'/>
-      <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>
-    <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' port=3D'-1' autoport=3D'yes'>
-      <listen type=3D'address'/>
-    </graphics>
-    <audio id=3D'1' type=3D'alsa'/>
-    <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/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args
deleted file mode 100644
index 292b1cefbb..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \
--accel kvm \
--cpu Skylake-Client-IBRS,vmx=3Don,hypervisor=3Don,ss=3Don,tsc-adjust=3Don,=
mpx=3Don,clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabiliti=
es=3Don,ssbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange=
-mc-no=3Don,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-act=
ivity-hlt=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=
=3Don,vmx-desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpi=
d=3Don,vmx-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Do=
n,vmx-invpcid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exi=
t=3Don,vmx-pml=3Don,vmx-xsaves=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=
=3Don,vmx-ept-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-=
invept-single-context=3Don,vmx-invept-all-context=3Don,vmx-invvpid=3Don,vmx=
-invvpid-single-addr=3Don,vmx-invvpid-all-context=3Don,vmx-intr-exit=3Don,v=
mx-nmi-exit=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=
=3Don,vmx-tsc-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-=
exit=3Don,vmx-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,=
vmx-cr3-store-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vm=
x-flexpriority=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=
=3Don,vmx-io-bitmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=
=3Don,vmx-pause-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=
=3Don,vmx-exit-ack-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,=
vmx-exit-save-efer=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-ti=
mer=3Don,vmx-entry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry=
-load-pat=3Don,vmx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 6,sockets=3D6,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0=
.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.xml
deleted file mode 100644
index 8ceb15959b..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<domain type=3D'kvm'>
-  <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'>6</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-4.2'>hvm</type>
-    <boot dev=3D'network'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'/>
-    <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/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args
deleted file mode 100644
index 85f71dbd68..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-5.0,usb=3Doff,dump-guest-core=3Doff \
--accel kvm \
--cpu Skylake-Client-IBRS,vmx=3Don,hypervisor=3Don,ss=3Don,tsc-adjust=3Don,=
mpx=3Don,clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabiliti=
es=3Don,ssbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange=
-mc-no=3Don,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-act=
ivity-hlt=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=
=3Don,vmx-desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpi=
d=3Don,vmx-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Do=
n,vmx-invpcid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exi=
t=3Don,vmx-pml=3Don,vmx-xsaves=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=
=3Don,vmx-ept-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-=
invept-single-context=3Don,vmx-invept-all-context=3Don,vmx-invvpid=3Don,vmx=
-invvpid-single-addr=3Don,vmx-invvpid-all-context=3Don,vmx-intr-exit=3Don,v=
mx-nmi-exit=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=
=3Don,vmx-tsc-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-=
exit=3Don,vmx-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,=
vmx-cr3-store-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vm=
x-flexpriority=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=
=3Don,vmx-io-bitmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=
=3Don,vmx-pause-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=
=3Don,vmx-exit-ack-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,=
vmx-exit-save-efer=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-ti=
mer=3Don,vmx-entry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry=
-load-pat=3Don,vmx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 6,sockets=3D6,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0=
.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.xml
deleted file mode 100644
index b9fb6b252f..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<domain type=3D'kvm'>
-  <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'>6</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.0'>hvm</type>
-    <boot dev=3D'network'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'/>
-    <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/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.1.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.1.0.args
deleted file mode 100644
index aa87a909fc..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.1.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-5.1,usb=3Doff,dump-guest-core=3Doff \
--accel kvm \
--cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D=
on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,=
amd-ssbd=3Don,virt-ssbd=3Don,rdctl-no=3Don,skip-l1dfl-vmentry=3Don,mds-no=
=3Don,pschange-mc-no=3Don \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 6,sockets=3D6,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.1.0=
.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.1.0.xml
deleted file mode 100644
index 592816f5d8..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.1.0.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<domain type=3D'kvm'>
-  <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'>6</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.1'>hvm</type>
-    <boot dev=3D'network'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'/>
-    <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/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.args
deleted file mode 100644
index e4c805bf4e..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 6,sockets=3D6,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0=
.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.xml
deleted file mode 100644
index f8a6358682..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.xml
+++ /dev/null
@@ -1,29 +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'>6</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-4.2'>hvm</type>
-    <boot dev=3D'network'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'/>
-    <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/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.args
deleted file mode 100644
index b90e177dce..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-5.0,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 6,sockets=3D6,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0=
.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.xml
deleted file mode 100644
index 1c41b7cae3..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.xml
+++ /dev/null
@@ -1,29 +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'>6</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.0'>hvm</type>
-    <boot dev=3D'network'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'/>
-    <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/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.args
deleted file mode 100644
index 837fb78129..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-5.1,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 6,sockets=3D6,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0=
.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.xml
deleted file mode 100644
index 2531aebb66..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.xml
+++ /dev/null
@@ -1,29 +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'>6</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.1'>hvm</type>
-    <boot dev=3D'network'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'/>
-    <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/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.args
deleted file mode 100644
index 38f5debb79..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.args
+++ /dev/null
@@ -1,38 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \
--accel kvm \
--cpu Skylake-Client-IBRS,vmx=3Don,hypervisor=3Don,ss=3Don,tsc-adjust=3Don,=
mpx=3Don,clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabiliti=
es=3Don,ssbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange=
-mc-no=3Don,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-act=
ivity-hlt=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=
=3Don,vmx-desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpi=
d=3Don,vmx-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Do=
n,vmx-invpcid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exi=
t=3Don,vmx-pml=3Don,vmx-xsaves=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=
=3Don,vmx-ept-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-=
invept-single-context=3Don,vmx-invept-all-context=3Don,vmx-invvpid=3Don,vmx=
-invvpid-single-addr=3Don,vmx-invvpid-all-context=3Don,vmx-intr-exit=3Don,v=
mx-nmi-exit=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=
=3Don,vmx-tsc-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-=
exit=3Don,vmx-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,=
vmx-cr3-store-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vm=
x-flexpriority=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=
=3Don,vmx-io-bitmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=
=3Don,vmx-pause-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=
=3Don,vmx-exit-ack-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,=
vmx-exit-save-efer=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-ti=
mer=3Don,vmx-entry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry=
-load-pat=3Don,vmx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
--device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
--device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
--device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \
--audiodev '{"id":"audio1","driver":"none"}' \
--global ICH9-LPC.noreboot=3Doff \
--watchdog-action reset \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.xml b/te=
sts/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.xml
deleted file mode 100644
index 10af5b281b..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<domain type=3D'kvm'>
-  <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-q35-4.2'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'1' port=3D'0x8'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'2' port=3D'0x9'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'3' port=3D'0xa'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'sata' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
-    </controller>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <audio id=3D'1' type=3D'none'/>
-    <watchdog model=3D'itco' action=3D'reset'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.args
deleted file mode 100644
index 4442dfe011..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.args
+++ /dev/null
@@ -1,38 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-q35-5.0,usb=3Doff,dump-guest-core=3Doff \
--accel kvm \
--cpu Skylake-Client-IBRS,vmx=3Don,hypervisor=3Don,ss=3Don,tsc-adjust=3Don,=
mpx=3Don,clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabiliti=
es=3Don,ssbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange=
-mc-no=3Don,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-act=
ivity-hlt=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=
=3Don,vmx-desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpi=
d=3Don,vmx-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Do=
n,vmx-invpcid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exi=
t=3Don,vmx-pml=3Don,vmx-xsaves=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=
=3Don,vmx-ept-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-=
invept-single-context=3Don,vmx-invept-all-context=3Don,vmx-invvpid=3Don,vmx=
-invvpid-single-addr=3Don,vmx-invvpid-all-context=3Don,vmx-intr-exit=3Don,v=
mx-nmi-exit=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=
=3Don,vmx-tsc-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-=
exit=3Don,vmx-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,=
vmx-cr3-store-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vm=
x-flexpriority=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=
=3Don,vmx-io-bitmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=
=3Don,vmx-pause-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=
=3Don,vmx-exit-ack-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,=
vmx-exit-save-efer=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-ti=
mer=3Don,vmx-entry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry=
-load-pat=3Don,vmx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
--device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
--device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
--device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \
--audiodev '{"id":"audio1","driver":"none"}' \
--global ICH9-LPC.noreboot=3Doff \
--watchdog-action reset \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.xml b/te=
sts/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.xml
deleted file mode 100644
index 9eab4c8d86..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<domain type=3D'kvm'>
-  <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-q35-5.0'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'1' port=3D'0x8'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'2' port=3D'0x9'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'3' port=3D'0xa'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'sata' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
-    </controller>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <audio id=3D'1' type=3D'none'/>
-    <watchdog model=3D'itco' action=3D'reset'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.1.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.1.0.args
deleted file mode 100644
index 0d2eea3e62..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.1.0.args
+++ /dev/null
@@ -1,38 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-q35-5.1,usb=3Doff,dump-guest-core=3Doff \
--accel kvm \
--cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D=
on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,=
amd-ssbd=3Don,virt-ssbd=3Don,rdctl-no=3Don,skip-l1dfl-vmentry=3Don,mds-no=
=3Don,pschange-mc-no=3Don \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
--device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
--device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
--device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \
--audiodev '{"id":"audio1","driver":"none"}' \
--global ICH9-LPC.noreboot=3Doff \
--watchdog-action reset \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.1.0.xml b/te=
sts/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.1.0.xml
deleted file mode 100644
index eb8ec4b78f..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.1.0.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<domain type=3D'kvm'>
-  <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-q35-5.1'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'1' port=3D'0x8'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'2' port=3D'0x9'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'3' port=3D'0xa'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'sata' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
-    </controller>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <audio id=3D'1' type=3D'none'/>
-    <watchdog model=3D'itco' action=3D'reset'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.=
args
deleted file mode 100644
index 292b1cefbb..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \
--accel kvm \
--cpu Skylake-Client-IBRS,vmx=3Don,hypervisor=3Don,ss=3Don,tsc-adjust=3Don,=
mpx=3Don,clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabiliti=
es=3Don,ssbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange=
-mc-no=3Don,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-act=
ivity-hlt=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=
=3Don,vmx-desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpi=
d=3Don,vmx-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Do=
n,vmx-invpcid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exi=
t=3Don,vmx-pml=3Don,vmx-xsaves=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=
=3Don,vmx-ept-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-=
invept-single-context=3Don,vmx-invept-all-context=3Don,vmx-invvpid=3Don,vmx=
-invvpid-single-addr=3Don,vmx-invvpid-all-context=3Don,vmx-intr-exit=3Don,v=
mx-nmi-exit=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=
=3Don,vmx-tsc-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-=
exit=3Don,vmx-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,=
vmx-cr3-store-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vm=
x-flexpriority=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=
=3Don,vmx-io-bitmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=
=3Don,vmx-pause-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=
=3Don,vmx-exit-ack-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,=
vmx-exit-save-efer=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-ti=
mer=3Don,vmx-entry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry=
-load-pat=3Don,vmx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 6,sockets=3D6,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2=
.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.x=
ml
deleted file mode 100644
index 8ceb15959b..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<domain type=3D'kvm'>
-  <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'>6</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-4.2'>hvm</type>
-    <boot dev=3D'network'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'/>
-    <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/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.=
args
deleted file mode 100644
index 85f71dbd68..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-5.0,usb=3Doff,dump-guest-core=3Doff \
--accel kvm \
--cpu Skylake-Client-IBRS,vmx=3Don,hypervisor=3Don,ss=3Don,tsc-adjust=3Don,=
mpx=3Don,clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabiliti=
es=3Don,ssbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange=
-mc-no=3Don,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-act=
ivity-hlt=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=
=3Don,vmx-desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpi=
d=3Don,vmx-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Do=
n,vmx-invpcid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exi=
t=3Don,vmx-pml=3Don,vmx-xsaves=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=
=3Don,vmx-ept-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-=
invept-single-context=3Don,vmx-invept-all-context=3Don,vmx-invvpid=3Don,vmx=
-invvpid-single-addr=3Don,vmx-invvpid-all-context=3Don,vmx-intr-exit=3Don,v=
mx-nmi-exit=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=
=3Don,vmx-tsc-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-=
exit=3Don,vmx-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,=
vmx-cr3-store-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vm=
x-flexpriority=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=
=3Don,vmx-io-bitmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=
=3Don,vmx-pause-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=
=3Don,vmx-exit-ack-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,=
vmx-exit-save-efer=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-ti=
mer=3Don,vmx-entry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry=
-load-pat=3Don,vmx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 6,sockets=3D6,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0=
.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.x=
ml
deleted file mode 100644
index b9fb6b252f..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<domain type=3D'kvm'>
-  <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'>6</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.0'>hvm</type>
-    <boot dev=3D'network'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'/>
-    <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/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.1=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.1.0.=
args
deleted file mode 100644
index aa87a909fc..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.1.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-5.1,usb=3Doff,dump-guest-core=3Doff \
--accel kvm \
--cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D=
on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,=
amd-ssbd=3Don,virt-ssbd=3Don,rdctl-no=3Don,skip-l1dfl-vmentry=3Don,mds-no=
=3Don,pschange-mc-no=3Don \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 6,sockets=3D6,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.1=
.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.1.0.x=
ml
deleted file mode 100644
index 592816f5d8..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.1.0.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<domain type=3D'kvm'>
-  <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'>6</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.1'>hvm</type>
-    <boot dev=3D'network'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'/>
-    <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/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.=
args
deleted file mode 100644
index e4c805bf4e..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 6,sockets=3D6,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2=
.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.x=
ml
deleted file mode 100644
index f8a6358682..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.xml
+++ /dev/null
@@ -1,29 +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'>6</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-4.2'>hvm</type>
-    <boot dev=3D'network'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'/>
-    <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/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.=
args
deleted file mode 100644
index b90e177dce..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-5.0,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 6,sockets=3D6,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0=
.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.x=
ml
deleted file mode 100644
index 1c41b7cae3..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.xml
+++ /dev/null
@@ -1,29 +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'>6</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.0'>hvm</type>
-    <boot dev=3D'network'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'/>
-    <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/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.=
args
deleted file mode 100644
index 837fb78129..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-5.1,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 6,sockets=3D6,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1=
.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.x=
ml
deleted file mode 100644
index 2531aebb66..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.xml
+++ /dev/null
@@ -1,29 +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'>6</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.1'>hvm</type>
-    <boot dev=3D'network'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'/>
-    <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/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.args
deleted file mode 100644
index 425a0d3a7c..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.args
+++ /dev/null
@@ -1,38 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
--device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
--device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
--device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \
--audiodev '{"id":"audio1","driver":"none"}' \
--global ICH9-LPC.noreboot=3Doff \
--watchdog-action reset \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.xml b/te=
sts/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.xml
deleted file mode 100644
index 247798eb94..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.xml
+++ /dev/null
@@ -1,48 +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-q35-4.2'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'1' port=3D'0x8'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'2' port=3D'0x9'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'3' port=3D'0xa'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'sata' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
-    </controller>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <audio id=3D'1' type=3D'none'/>
-    <watchdog model=3D'itco' action=3D'reset'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.args
deleted file mode 100644
index 4e1912f76e..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.args
+++ /dev/null
@@ -1,38 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-q35-5.0,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
--device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
--device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
--device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \
--audiodev '{"id":"audio1","driver":"none"}' \
--global ICH9-LPC.noreboot=3Doff \
--watchdog-action reset \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.xml b/te=
sts/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.xml
deleted file mode 100644
index e4881a63e1..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.xml
+++ /dev/null
@@ -1,48 +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-q35-5.0'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'1' port=3D'0x8'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'2' port=3D'0x9'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'3' port=3D'0xa'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'sata' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
-    </controller>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <audio id=3D'1' type=3D'none'/>
-    <watchdog model=3D'itco' action=3D'reset'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.args
deleted file mode 100644
index 35c764045e..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.args
+++ /dev/null
@@ -1,38 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-q35-5.1,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
--device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
--device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
--device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \
--audiodev '{"id":"audio1","driver":"none"}' \
--global ICH9-LPC.noreboot=3Doff \
--watchdog-action reset \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.xml b/te=
sts/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.xml
deleted file mode 100644
index 4b783b2e92..0000000000
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.xml
+++ /dev/null
@@ -1,48 +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-q35-5.1'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <cpu mode=3D'host-model' check=3D'partial'/>
-  <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'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'1' port=3D'0x8'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'2' port=3D'0x9'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'3' port=3D'0xa'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'sata' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
-    </controller>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <audio id=3D'1' type=3D'none'/>
-    <watchdog model=3D'itco' action=3D'reset'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.a=
rgs b/tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args
deleted file mode 100644
index b401400999..0000000000
--- a/tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args
+++ /dev/null
@@ -1,45 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-5.0,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu qemu64 \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--object secret,id=3Dobjlibvirt-3-storage_tls0-secret0,data=3D9eao5F8qtkGt+=
seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=3DmasterKey0,iv=
=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \
--object tls-creds-x509,id=3Dobjlibvirt-3-storage_tls0,dir=3D/etc/pki/libvi=
rt-vxhs,endpoint=3Dclient,verify-peer=3Don,passwordid=3Dobjlibvirt-3-storag=
e_tls0-secret0 \
--blockdev '{"driver":"vxhs","tls-creds":"objlibvirt-3-storage_tls0","vdisk=
-id":"eb90327c-8302-4725-9e1b-4e85ed4dc251","server":{"host":"192.168.0.1",=
"port":"9999"},"node-name":"libvirt-3-storage","auto-read-only":true,"disca=
rd":"unmap","cache":{"direct":true,"no-flush":false}}' \
--blockdev '{"node-name":"libvirt-3-format","read-only":false,"cache":{"dir=
ect":true,"no-flush":false},"driver":"raw","file":"libvirt-3-storage"}' \
--device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-3-format,id=
=3Dvirtio-disk0,bootindex=3D1,write-cache=3Don,serial=3Deb90327c-8302-4725-=
9e1b-4e85ed4dc251 \
--object secret,id=3Dobjlibvirt-2-storage_tls0-secret0,data=3D9eao5F8qtkGt+=
seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=3DmasterKey0,iv=
=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \
--object tls-creds-x509,id=3Dobjlibvirt-2-storage_tls0,dir=3D/etc/pki/libvi=
rt-vxhs,endpoint=3Dclient,verify-peer=3Don,passwordid=3Dobjlibvirt-2-storag=
e_tls0-secret0 \
--blockdev '{"driver":"vxhs","tls-creds":"objlibvirt-2-storage_tls0","vdisk=
-id":"eb90327c-8302-4725-9e1b-4e85ed4dc252","server":{"host":"192.168.0.2",=
"port":"9999"},"node-name":"libvirt-2-storage","auto-read-only":true,"disca=
rd":"unmap","cache":{"direct":true,"no-flush":false}}' \
--blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir=
ect":true,"no-flush":false},"driver":"raw","file":"libvirt-2-storage"}' \
--device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-2-format,id=
=3Dvirtio-disk1,write-cache=3Don,serial=3Deb90327c-8302-4725-9e1b-4e85ed4dc=
252 \
--blockdev '{"driver":"vxhs","vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc2=
53","server":{"host":"192.168.0.3","port":"9999"},"node-name":"libvirt-1-st=
orage","auto-read-only":true,"discard":"unmap","cache":{"direct":true,"no-f=
lush":false}}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir=
ect":true,"no-flush":false},"driver":"raw","file":"libvirt-1-storage"}' \
--device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-1-format,id=
=3Dvirtio-disk2,write-cache=3Don,serial=3Deb90327c-8302-4725-9e1b-4e85ed4dc=
252 \
--audiodev '{"id":"audio1","driver":"none"}' \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.x=
ml b/tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.xml
deleted file mode 100644
index ef020d7de5..0000000000
--- a/tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.xml
+++ /dev/null
@@ -1,56 +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-i440fx-5.0'>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'raw' cache=3D'none'/>
-      <source protocol=3D'vxhs' name=3D'eb90327c-8302-4725-9e1b-4e85ed4dc2=
51'>
-        <host name=3D'192.168.0.1' port=3D'9999'/>
-      </source>
-      <target dev=3D'vda' bus=3D'virtio'/>
-      <serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial>
-      <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'raw' cache=3D'none'/>
-      <source protocol=3D'vxhs' name=3D'eb90327c-8302-4725-9e1b-4e85ed4dc2=
52'>
-        <host name=3D'192.168.0.2' port=3D'9999'/>
-      </source>
-      <target dev=3D'vdb' bus=3D'virtio'/>
-      <serial>eb90327c-8302-4725-9e1b-4e85ed4dc252</serial>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
-    </disk>
-    <disk type=3D'network' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'raw' cache=3D'none'/>
-      <source protocol=3D'vxhs' name=3D'eb90327c-8302-4725-9e1b-4e85ed4dc2=
53' tls=3D'no'>
-        <host name=3D'192.168.0.3' port=3D'9999'/>
-      </source>
-      <target dev=3D'vdc' bus=3D'virtio'/>
-      <serial>eb90327c-8302-4725-9e1b-4e85ed4dc252</serial>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' 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'none'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.xml b/tests/qe=
muxmlconfdata/disk-network-tlsx509-vxhs.xml
deleted file mode 100644
index 775e5e3b59..0000000000
--- a/tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.xml
+++ /dev/null
@@ -1,50 +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>
-  <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'raw' cache=3D'none'/>
-      <source protocol=3D'vxhs' name=3D'eb90327c-8302-4725-9e1b-4e85ed4dc2=
51'>
-        <host name=3D'192.168.0.1' port=3D'9999'/>
-      </source>
-      <target dev=3D'vda' bus=3D'virtio'/>
-      <serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial>
-      <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'raw' cache=3D'none'/>
-      <source protocol=3D'vxhs' name=3D'eb90327c-8302-4725-9e1b-4e85ed4dc2=
52'>
-        <host name=3D'192.168.0.2' port=3D'9999'/>
-      </source>
-      <target dev=3D'vdb' bus=3D'virtio'/>
-      <serial>eb90327c-8302-4725-9e1b-4e85ed4dc252</serial>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
-    </disk>
-    <disk type=3D'network' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'raw' cache=3D'none'/>
-      <source protocol=3D'vxhs' name=3D'eb90327c-8302-4725-9e1b-4e85ed4dc2=
53' tls=3D'no'>
-        <host name=3D'192.168.0.3' port=3D'9999'/>
-      </source>
-      <target dev=3D'vdc' bus=3D'virtio'/>
-      <serial>eb90327c-8302-4725-9e1b-4e85ed4dc252</serial>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
-    </disk>
-    <controller type=3D'usb' index=3D'0'/>
-    <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'/>
-    <memballoon model=3D'none'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/disk-network-vxhs.x86_64-5.0.0.args b/te=
sts/qemuxmlconfdata/disk-network-vxhs.x86_64-5.0.0.args
deleted file mode 100644
index 837806b002..0000000000
--- a/tests/qemuxmlconfdata/disk-network-vxhs.x86_64-5.0.0.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-5.0,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu qemu64 \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--blockdev '{"driver":"vxhs","vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc2=
51","server":{"host":"192.168.0.1","port":"9999"},"node-name":"libvirt-1-st=
orage","auto-read-only":true,"discard":"unmap","cache":{"direct":true,"no-f=
lush":false}}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir=
ect":true,"no-flush":false},"driver":"raw","file":"libvirt-1-storage"}' \
--device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,id=
=3Dvirtio-disk0,bootindex=3D1,write-cache=3Don,serial=3Deb90327c-8302-4725-=
9e1b-4e85ed4dc251 \
--audiodev '{"id":"audio1","driver":"none"}' \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/disk-network-vxhs.x86_64-5.0.0.xml b/tes=
ts/qemuxmlconfdata/disk-network-vxhs.x86_64-5.0.0.xml
deleted file mode 100644
index 15293600ee..0000000000
--- a/tests/qemuxmlconfdata/disk-network-vxhs.x86_64-5.0.0.xml
+++ /dev/null
@@ -1,38 +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'i686' machine=3D'pc-i440fx-5.0'>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'raw' cache=3D'none'/>
-      <source protocol=3D'vxhs' name=3D'eb90327c-8302-4725-9e1b-4e85ed4dc2=
51'>
-        <host name=3D'192.168.0.1' port=3D'9999'/>
-      </source>
-      <target dev=3D'vda' bus=3D'virtio'/>
-      <serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial>
-      <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'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/qemuxmlconfdata/disk-network-vxhs.xml b/tests/qemuxmlcon=
fdata/disk-network-vxhs.xml
deleted file mode 100644
index 4f4df2f9ee..0000000000
--- a/tests/qemuxmlconfdata/disk-network-vxhs.xml
+++ /dev/null
@@ -1,32 +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'i686' machine=3D'pc'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type=3D'network' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'raw' cache=3D'none'/>
-      <source protocol=3D'vxhs' name=3D'eb90327c-8302-4725-9e1b-4e85ed4dc2=
51'>
-        <host name=3D'192.168.0.1' port=3D'9999'/>
-      </source>
-      <target dev=3D'vda' bus=3D'virtio'/>
-      <serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial>
-      <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'/>
-    <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'/>
-    <memballoon model=3D'none'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.args b/=
tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.args
deleted file mode 100644
index 2f52151245..0000000000
--- a/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.args
+++ /dev/null
@@ -1,39 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu qemu64 \
--m size=3D14680064k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--object memory-backend-file,id=3Dram-node0,mem-path=3D/var/lib/libvirt/qem=
u/ram/-1-QEMUGuest1/ram-node0,share=3Don,size=3D15032385536 \
--numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--chardev socket,id=3Dchr-vu-virtio-disk0,path=3D/tmp/vhost1.sock \
--device vhost-user-blk-pci,bus=3Dpci.0,addr=3D0x2,chardev=3Dchr-vu-virtio-=
disk0,id=3Dvirtio-disk0,bootindex=3D1 \
--chardev socket,id=3Dchr-vu-virtio-disk1,path=3D/tmp/vhost1.sock,reconnect=
=3D10 \
--device vhost-user-blk-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-p=
er-vq=3Don,bus=3Dpci.0,addr=3D0x3,chardev=3Dchr-vu-virtio-disk1,id=3Dvirtio=
-disk1 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.xml b/t=
ests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.xml
deleted file mode 100644
index d020923bc7..0000000000
--- a/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.xml
+++ /dev/null
@@ -1,48 +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-i440fx-4.2'>hvm</type>
-  </os>
-  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
-    <model fallback=3D'forbid'>qemu64</model>
-    <numa>
-      <cell id=3D'0' cpus=3D'0' memory=3D'14680064' unit=3D'KiB' memAccess=
=3D'shared'/>
-    </numa>
-  </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'vhostuser' device=3D'disk' snapshot=3D'no'>
-      <driver name=3D'qemu' type=3D'raw'/>
-      <source type=3D'unix' path=3D'/tmp/vhost1.sock'/>
-      <target dev=3D'vda' bus=3D'virtio'/>
-      <boot order=3D'1'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
-    </disk>
-    <disk type=3D'vhostuser' device=3D'disk' snapshot=3D'no'>
-      <driver name=3D'qemu' type=3D'raw' iommu=3D'on' ats=3D'on' packed=3D=
'on' page_per_vq=3D'on'/>
-      <source type=3D'unix' path=3D'/tmp/vhost1.sock'>
-        <reconnect enabled=3D'yes' timeout=3D'10'/>
-      </source>
-      <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'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/qemuxmlconfdata/fips-enabled.x86_64-5.1.0.args b/tests/q=
emuxmlconfdata/fips-enabled.x86_64-5.1.0.args
deleted file mode 100644
index 2c8a273f74..0000000000
--- a/tests/qemuxmlconfdata/fips-enabled.x86_64-5.1.0.args
+++ /dev/null
@@ -1,37 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--enable-fips \
--machine pc-i440fx-5.1,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu qemu64 \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no=
de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw=
","file":"libvirt-1-storage"}' \
--device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0=
,bootindex=3D1 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/fips-enabled.x86_64-5.1.0.xml b/tests/qe=
muxmlconfdata/fips-enabled.x86_64-5.1.0.xml
deleted file mode 100644
index 5fb54cfd81..0000000000
--- a/tests/qemuxmlconfdata/fips-enabled.x86_64-5.1.0.xml
+++ /dev/null
@@ -1,40 +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' cpuset=3D'1-4,8-20,525'>1</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.1'>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'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'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'0x02' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.=
0.args b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.ar=
gs
deleted file mode 100644
index 087091545d..0000000000
--- a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest2 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest2,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest2/master-key.aes \
--machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \
--accel kvm \
--cpu qemu64 \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
--device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
--audiodev '{"id":"audio1","driver":"none"}' \
--global ICH9-LPC.noreboot=3Doff \
--watchdog-action reset \
--device vhost-scsi-pci,wwpn=3Dnaa.5123456789abcde0,vhostfd=3D3,id=3Dhostde=
v0,bus=3Dpci.1,addr=3D0x0 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.=
0.xml b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.xml
deleted file mode 100644
index 02c9931299..0000000000
--- a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<domain type=3D'kvm'>
-  <name>QEMUGuest2</name>
-  <uuid>c7a5fdbd-edaf-9466-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-q35-4.2'>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'none'/>
-    <controller type=3D'sata' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'1' port=3D'0x8'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'2' port=3D'0x9'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <audio id=3D'1' type=3D'none'/>
-    <hostdev mode=3D'subsystem' type=3D'scsi_host' managed=3D'no'>
-      <source protocol=3D'vhost' wwpn=3D'naa.5123456789abcde0'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </hostdev>
-    <watchdog model=3D'itco' action=3D'reset'/>
-    <memballoon model=3D'none'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-5.1.0.err b/=
tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-5.1.0.err
deleted file mode 100644
index dacf1c27fb..0000000000
--- a/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-5.1.0.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: memory access mode 'shared' not supported witho=
ut guest numa node
diff --git a/tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.s390x-4.2.0.ar=
gs b/tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.s390x-4.2.0.args
deleted file mode 100644
index c274dc09c3..0000000000
--- a/tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.s390x-4.2.0.args
+++ /dev/null
@@ -1,39 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-s390x \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine s390-ccw-virtio-4.2,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu qemu \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--object iothread,id=3Diothread1 \
--object iothread,id=3Diothread2 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--boot strict=3Don \
--blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no=
de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw=
","file":"libvirt-2-storage"}' \
--device virtio-blk-ccw,iothread=3Diothread1,scsi=3Doff,devno=3Dfe.0.0000,d=
rive=3Dlibvirt-2-format,id=3Dvirtio-disk0,bootindex=3D1 \
--blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no=
de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw=
","file":"libvirt-1-storage"}' \
--device virtio-blk-ccw,iothread=3Diothread2,scsi=3Doff,devno=3D0.0.0007,dr=
ive=3Dlibvirt-1-format,id=3Dvirtio-disk1 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.s390x-4.2.0.xm=
l b/tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.s390x-4.2.0.xml
deleted file mode 100644
index 95a0f102b7..0000000000
--- a/tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.s390x-4.2.0.xml
+++ /dev/null
@@ -1,41 +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>
-  <iothreads>2</iothreads>
-  <os>
-    <type arch=3D's390x' machine=3D's390-ccw-virtio-4.2'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
-    <model fallback=3D'forbid'>qemu</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-s390x</emulator>
-    <disk type=3D'block' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'raw' iothread=3D'1'/>
-      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
-      <target dev=3D'hda' bus=3D'virtio'/>
-      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
-    </disk>
-    <disk type=3D'block' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'raw' iothread=3D'2'/>
-      <source dev=3D'/dev/HostVG/QEMUGuest2'/>
-      <target dev=3D'hdb' bus=3D'virtio'/>
-      <address type=3D'ccw' cssid=3D'0x0' ssid=3D'0x0' devno=3D'0x0007'/>
-    </disk>
-    <controller type=3D'usb' index=3D'0' model=3D'none'/>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <audio id=3D'1' type=3D'none'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x000a'/>
-    </memballoon>
-    <panic model=3D's390'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.xml b/tests/qe=
muxmlconfdata/iothreads-disk-virtio-ccw.xml
deleted file mode 100644
index dd2f6062c2..0000000000
--- a/tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.xml
+++ /dev/null
@@ -1,34 +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>
-  <iothreads>2</iothreads>
-  <os>
-    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-s390x</emulator>
-    <disk type=3D'block' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'raw' iothread=3D'1'/>
-      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
-      <target dev=3D'hda' bus=3D'virtio'/>
-    </disk>
-    <disk type=3D'block' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'raw' iothread=3D'2'/>
-      <source dev=3D'/dev/HostVG/QEMUGuest2'/>
-      <target dev=3D'hdb' bus=3D'virtio'/>
-      <address type=3D'ccw' cssid=3D'0x0' ssid=3D'0x0' devno=3D'0x0007'/>
-    </disk>
-    <controller type=3D'usb' index=3D'0' model=3D'none'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x000a'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_=
64-5.1.0.err b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x8=
6_64-5.1.0.err
deleted file mode 100644
index 55ec41c476..0000000000
--- a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.=
0.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: setting the 'hotplug' property on a 'pci-root' =
device is not supported by this QEMU binary
diff --git a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_6=
4-5.1.0.err b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_=
64-5.1.0.err
deleted file mode 100644
index 55ec41c476..0000000000
--- a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0=
.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: setting the 'hotplug' property on a 'pci-root' =
device is not supported by this QEMU binary
diff --git a/tests/qemuxmlconfdata/pseries-features.ppc64-4.2.0.args b/test=
s/qemuxmlconfdata/pseries-features.ppc64-4.2.0.args
deleted file mode 100644
index f4d0ed556e..0000000000
--- a/tests/qemuxmlconfdata/pseries-features.ppc64-4.2.0.args
+++ /dev/null
@@ -1,30 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-guest \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \
-/usr/bin/qemu-system-ppc64 \
--name guest=3Dguest,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-guest/master-key.aes \
--machine pseries-4.2,usb=3Doff,resize-hpt=3Drequired,cap-hpt-max-page-size=
=3D1048576k,cap-htm=3Don,cap-nested-hv=3Doff,cap-ccf-assist=3Don,cap-cfpc=
=3Dfixed,cap-sbbc=3Dbroken,cap-ibs=3Dfixed-ccd,dump-guest-core=3Doff \
--accel tcg \
--cpu POWER9 \
--m size=3D524288k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--boot strict=3Don \
--audiodev '{"id":"audio1","driver":"none"}' \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/pseries-features.ppc64-4.2.0.xml b/tests=
/qemuxmlconfdata/pseries-features.ppc64-4.2.0.xml
deleted file mode 100644
index c0ff69e5ba..0000000000
--- a/tests/qemuxmlconfdata/pseries-features.ppc64-4.2.0.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type=3D'qemu'>
-  <name>guest</name>
-  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
-  <memory unit=3D'KiB'>524288</memory>
-  <currentMemory unit=3D'KiB'>524288</currentMemory>
-  <vcpu placement=3D'static'>1</vcpu>
-  <os>
-    <type arch=3D'ppc64' machine=3D'pseries-4.2'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <features>
-    <hpt resizing=3D'required'>
-      <maxpagesize unit=3D'KiB'>1048576</maxpagesize>
-    </hpt>
-    <htm state=3D'on'/>
-    <nested-hv state=3D'off'/>
-    <ccf-assist state=3D'on'/>
-    <cfpc value=3D'fixed'/>
-    <sbbc value=3D'broken'/>
-    <ibs value=3D'fixed-ccd'/>
-  </features>
-  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
-    <model fallback=3D'forbid'>POWER9</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-ppc64</emulator>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
-      <model name=3D'spapr-pci-host-bridge'/>
-      <target index=3D'0'/>
-    </controller>
-    <controller type=3D'usb' index=3D'0' model=3D'none'/>
-    <audio id=3D'1' type=3D'none'/>
-    <memballoon model=3D'none'/>
-    <panic model=3D'pseries'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-4.2.0.ar=
gs b/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-4.2.0.args
deleted file mode 100644
index 1babfe212f..0000000000
--- a/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-4.2.0.args
+++ /dev/null
@@ -1,38 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3Dq35-test,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-q35-test/master-key.aes \
--machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu qemu64 \
--m size=3D2097152k \
--overcommit mem-lock=3Doff \
--smp 2,sockets=3D2,cores=3D1,threads=3D1 \
--uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
--device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
--device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
--device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \
--audiodev '{"id":"audio1","driver":"none"}' \
--global ICH9-LPC.noreboot=3Doff \
--watchdog-action reset \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-4.2.0.xm=
l b/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-4.2.0.xml
deleted file mode 100644
index b107164ff6..0000000000
--- a/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-4.2.0.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<domain type=3D'qemu'>
-  <name>q35-test</name>
-  <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
-  <memory unit=3D'KiB'>2097152</memory>
-  <currentMemory unit=3D'KiB'>2097152</currentMemory>
-  <vcpu placement=3D'static' cpuset=3D'0-1'>2</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-q35-4.2'>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'qemu-xhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'sata' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'1' port=3D'0x8'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'2' port=3D'0x9'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'3' port=3D'0xa'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <audio id=3D'1' type=3D'none'/>
-    <watchdog model=3D'itco' action=3D'reset'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/q35-multifunction.x86_64-4.2.0.args b/te=
sts/qemuxmlconfdata/q35-multifunction.x86_64-4.2.0.args
deleted file mode 100644
index acef32f256..0000000000
--- a/tests/qemuxmlconfdata/q35-multifunction.x86_64-4.2.0.args
+++ /dev/null
@@ -1,53 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3Dq35-test,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-q35-test/master-key.aes \
--machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu qemu64 \
--m size=3D2097152k \
--overcommit mem-lock=3Doff \
--smp 2,sockets=3D2,cores=3D1,threads=3D1 \
--uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device pcie-root-port,port=3D16,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multi=
function=3Don,addr=3D0x2 \
--device pcie-root-port,port=3D17,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x2.0x1 \
--device pcie-root-port,port=3D18,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x2.0x2 \
--device pcie-root-port,port=3D24,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,multi=
function=3Don,addr=3D0x3 \
--device pcie-root-port,port=3D25,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,multi=
function=3Don,addr=3D0x3.0x1 \
--device pcie-root-port,port=3D32,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,multi=
function=3Doff,addr=3D0x4 \
--device pcie-root-port,port=3D33,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr=
=3D0x4.0x1 \
--device pcie-root-port,port=3D8,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
--device pcie-root-port,port=3D9,chassis=3D9,id=3Dpci.9,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
--device pcie-root-port,port=3D10,chassis=3D10,id=3Dpci.10,bus=3Dpcie.0,add=
r=3D0x1.0x2 \
--device pcie-root-port,port=3D11,chassis=3D11,id=3Dpci.11,bus=3Dpcie.0,add=
r=3D0x1.0x3 \
--device pcie-root-port,port=3D12,chassis=3D12,id=3Dpci.12,bus=3Dpcie.0,add=
r=3D0x1.0x4 \
--device pcie-root-port,port=3D13,chassis=3D13,id=3Dpci.13,bus=3Dpcie.0,add=
r=3D0x1.0x5 \
--device pcie-root-port,port=3D14,chassis=3D14,id=3Dpci.14,bus=3Dpcie.0,add=
r=3D0x1.0x6 \
--device pcie-root-port,port=3D15,chassis=3D15,id=3Dpci.15,bus=3Dpcie.0,add=
r=3D0x1.0x7 \
--device pcie-root-port,port=3D19,chassis=3D16,id=3Dpci.16,bus=3Dpcie.0,add=
r=3D0x2.0x3 \
--device pcie-root-port,port=3D20,chassis=3D17,id=3Dpci.17,bus=3Dpcie.0,add=
r=3D0x2.0x4 \
--device pcie-root-port,port=3D21,chassis=3D18,id=3Dpci.18,bus=3Dpcie.0,add=
r=3D0x2.0x5 \
--device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \
--audiodev '{"id":"audio1","driver":"none"}' \
--global ICH9-LPC.noreboot=3Doff \
--watchdog-action reset \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/q35-multifunction.x86_64-4.2.0.xml b/tes=
ts/qemuxmlconfdata/q35-multifunction.x86_64-4.2.0.xml
deleted file mode 100644
index e647bfcea4..0000000000
--- a/tests/qemuxmlconfdata/q35-multifunction.x86_64-4.2.0.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<domain type=3D'qemu'>
-  <name>q35-test</name>
-  <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
-  <memory unit=3D'KiB'>2097152</memory>
-  <currentMemory unit=3D'KiB'>2097152</currentMemory>
-  <vcpu placement=3D'static' cpuset=3D'0-1'>2</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-q35-4.2'>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'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'1' port=3D'0x10'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'2' port=3D'0x11'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'3' port=3D'0x12'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'4' port=3D'0x18'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'5' port=3D'0x19'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x1' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'6' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'6' port=3D'0x20'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0' multifunction=3D'off'/>
-    </controller>
-    <controller type=3D'pci' index=3D'7' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'7' port=3D'0x21'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'8' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'8' port=3D'0x8'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'9' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'9' port=3D'0x9'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'10' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'10' port=3D'0xa'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'pci' index=3D'11' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'11' port=3D'0xb'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x3'/>
-    </controller>
-    <controller type=3D'pci' index=3D'12' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'12' port=3D'0xc'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x4'/>
-    </controller>
-    <controller type=3D'pci' index=3D'13' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'13' port=3D'0xd'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x5'/>
-    </controller>
-    <controller type=3D'pci' index=3D'14' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'14' port=3D'0xe'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x6'/>
-    </controller>
-    <controller type=3D'pci' index=3D'15' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'15' port=3D'0xf'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x7'/>
-    </controller>
-    <controller type=3D'pci' index=3D'16' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'16' port=3D'0x13'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x3'/>
-    </controller>
-    <controller type=3D'pci' index=3D'17' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'17' port=3D'0x14'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x4'/>
-    </controller>
-    <controller type=3D'pci' index=3D'18' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'18' port=3D'0x15'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x5'/>
-    </controller>
-    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'sata' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
-    </controller>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <audio id=3D'1' type=3D'none'/>
-    <watchdog model=3D'itco' action=3D'reset'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-4.2.0.args b/tes=
ts/qemuxmlconfdata/q35-pcie-autoadd.x86_64-4.2.0.args
deleted file mode 100644
index d236463b16..0000000000
--- a/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-4.2.0.args
+++ /dev/null
@@ -1,67 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3Dq35-test,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-q35-test/master-key.aes \
--machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu qemu64 \
--m size=3D2097152k \
--overcommit mem-lock=3Doff \
--smp 2,sockets=3D2,cores=3D1,threads=3D1 \
--uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device pcie-root-port,port=3D16,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multi=
function=3Don,addr=3D0x2 \
--device pcie-root-port,port=3D17,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x2.0x1 \
--device pcie-root-port,port=3D18,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x2.0x2 \
--device pcie-root-port,port=3D19,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=
=3D0x2.0x3 \
--device pcie-root-port,port=3D20,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr=
=3D0x2.0x4 \
--device pcie-root-port,port=3D21,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr=
=3D0x2.0x5 \
--device pcie-root-port,port=3D22,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr=
=3D0x2.0x6 \
--device pcie-root-port,port=3D23,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,addr=
=3D0x2.0x7 \
--device pcie-root-port,port=3D24,chassis=3D9,id=3Dpci.9,bus=3Dpcie.0,multi=
function=3Don,addr=3D0x3 \
--device pcie-root-port,port=3D25,chassis=3D10,id=3Dpci.10,bus=3Dpcie.0,add=
r=3D0x3.0x1 \
--device pcie-root-port,port=3D26,chassis=3D11,id=3Dpci.11,bus=3Dpcie.0,add=
r=3D0x3.0x2 \
--device pcie-root-port,port=3D27,chassis=3D12,id=3Dpci.12,bus=3Dpcie.0,add=
r=3D0x3.0x3 \
--device pcie-root-port,port=3D28,chassis=3D13,id=3Dpci.13,bus=3Dpcie.0,add=
r=3D0x3.0x4 \
--device pcie-root-port,port=3D29,chassis=3D14,id=3Dpci.14,bus=3Dpcie.0,add=
r=3D0x3.0x5 \
--device nec-usb-xhci,id=3Dusb,bus=3Dpci.6,addr=3D0x0 \
--device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.5,addr=3D0x0 \
--device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.4,addr=3D0x0 \
--blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no=
de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw=
","file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=3Doff,bus=3Dpci.7,addr=3D0x0,drive=3Dlibvirt-1=
-format,id=3Dvirtio-disk1,bootindex=3D1 \
--fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to=
/guest \
--device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D/import/from/=
host,bus=3Dpci.1,addr=3D0x0 \
--netdev user,id=3Dhostnet0 \
--device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55=
,bus=3Dpci.2,addr=3D0x0 \
--netdev user,id=3Dhostnet1 \
--device e1000e,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:44:66,bus=3Dp=
ci.3,addr=3D0x0 \
--device virtio-input-host-pci,id=3Dinput0,evdev=3D/dev/input/event1234,bus=
=3Dpci.10,addr=3D0x0 \
--device virtio-mouse-pci,id=3Dinput1,bus=3Dpci.11,addr=3D0x0 \
--device virtio-keyboard-pci,id=3Dinput2,bus=3Dpci.12,addr=3D0x0 \
--device virtio-tablet-pci,id=3Dinput3,bus=3Dpci.13,addr=3D0x0 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-vga,id=3Dvideo0,max_outputs=3D1,bus=3Dpcie.0,addr=3D0x1 \
--global ICH9-LPC.noreboot=3Doff \
--watchdog-action reset \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.8,addr=3D0x0 \
--object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \
--device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,max-bytes=3D123,period=3D12=
34,bus=3Dpci.9,addr=3D0x0 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-4.2.0.xml b/test=
s/qemuxmlconfdata/q35-pcie-autoadd.x86_64-4.2.0.xml
deleted file mode 100644
index d33a9876fb..0000000000
--- a/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-4.2.0.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<domain type=3D'qemu'>
-  <name>q35-test</name>
-  <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
-  <memory unit=3D'KiB'>2097152</memory>
-  <currentMemory unit=3D'KiB'>2097152</currentMemory>
-  <vcpu placement=3D'static' cpuset=3D'0-1'>2</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-q35-4.2'>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'vdb' bus=3D'virtio'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x07' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </disk>
-    <controller type=3D'virtio-serial' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'usb' index=3D'0' model=3D'nec-xhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x06' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'sata' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'1' port=3D'0x10'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'2' port=3D'0x11'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'3' port=3D'0x12'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'4' port=3D'0x13'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x3'/>
-    </controller>
-    <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'5' port=3D'0x14'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x4'/>
-    </controller>
-    <controller type=3D'pci' index=3D'6' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'6' port=3D'0x15'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x5'/>
-    </controller>
-    <controller type=3D'pci' index=3D'7' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'7' port=3D'0x16'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x6'/>
-    </controller>
-    <controller type=3D'pci' index=3D'8' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'8' port=3D'0x17'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x7'/>
-    </controller>
-    <controller type=3D'pci' index=3D'9' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'9' port=3D'0x18'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'10' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'10' port=3D'0x19'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'11' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'11' port=3D'0x1a'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'pci' index=3D'12' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'12' port=3D'0x1b'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x3'/>
-    </controller>
-    <controller type=3D'pci' index=3D'13' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'13' port=3D'0x1c'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x4'/>
-    </controller>
-    <controller type=3D'pci' index=3D'14' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'14' port=3D'0x1d'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x5'/>
-    </controller>
-    <filesystem type=3D'mount' accessmode=3D'passthrough'>
-      <source dir=3D'/export/to/guest'/>
-      <target dir=3D'/import/from/host'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </filesystem>
-    <interface type=3D'user'>
-      <mac address=3D'00:11:22:33:44:55'/>
-      <model type=3D'virtio'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </interface>
-    <interface type=3D'user'>
-      <mac address=3D'00:11:22:33:44:66'/>
-      <model type=3D'e1000e'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </interface>
-    <input type=3D'passthrough' bus=3D'virtio'>
-      <source evdev=3D'/dev/input/event1234'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0a' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </input>
-    <input type=3D'mouse' bus=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0b' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </input>
-    <input type=3D'keyboard' bus=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0c' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </input>
-    <input type=3D'tablet' bus=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0d' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </input>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <audio id=3D'1' type=3D'none'/>
-    <video>
-      <model type=3D'virtio' heads=3D'1' primary=3D'yes'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
-    </video>
-    <watchdog model=3D'itco' action=3D'reset'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x08' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </memballoon>
-    <rng model=3D'virtio'>
-      <rate bytes=3D'123' period=3D'1234'/>
-      <backend model=3D'random'>/dev/urandom</backend>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x09' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </rng>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/q35-pcie.x86_64-4.2.0.args b/tests/qemux=
mlconfdata/q35-pcie.x86_64-4.2.0.args
deleted file mode 100644
index 1a79afdc7f..0000000000
--- a/tests/qemuxmlconfdata/q35-pcie.x86_64-4.2.0.args
+++ /dev/null
@@ -1,68 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3Dq35-test,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-q35-test/master-key.aes \
--machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--cpu qemu64 \
--m size=3D2097152k \
--overcommit mem-lock=3Doff \
--smp 2,sockets=3D2,cores=3D1,threads=3D1 \
--uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \
--device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \
--device pcie-root-port,port=3D16,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,multi=
function=3Don,addr=3D0x2 \
--device pcie-root-port,port=3D17,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=
=3D0x2.0x1 \
--device pcie-root-port,port=3D18,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr=
=3D0x2.0x2 \
--device pcie-root-port,port=3D19,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr=
=3D0x2.0x3 \
--device pcie-root-port,port=3D20,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr=
=3D0x2.0x4 \
--device pcie-root-port,port=3D21,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,addr=
=3D0x2.0x5 \
--device pcie-root-port,port=3D22,chassis=3D9,id=3Dpci.9,bus=3Dpcie.0,addr=
=3D0x2.0x6 \
--device pcie-root-port,port=3D23,chassis=3D10,id=3Dpci.10,bus=3Dpcie.0,add=
r=3D0x2.0x7 \
--device pcie-root-port,port=3D24,chassis=3D11,id=3Dpci.11,bus=3Dpcie.0,mul=
tifunction=3Don,addr=3D0x3 \
--device pcie-root-port,port=3D25,chassis=3D12,id=3Dpci.12,bus=3Dpcie.0,add=
r=3D0x3.0x1 \
--device pcie-root-port,port=3D26,chassis=3D13,id=3Dpci.13,bus=3Dpcie.0,add=
r=3D0x3.0x2 \
--device pcie-root-port,port=3D27,chassis=3D14,id=3Dpci.14,bus=3Dpcie.0,add=
r=3D0x3.0x3 \
--device pcie-root-port,port=3D28,chassis=3D15,id=3Dpci.15,bus=3Dpcie.0,add=
r=3D0x3.0x4 \
--device nec-usb-xhci,id=3Dusb,bus=3Dpci.8,addr=3D0x0 \
--device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.7,addr=3D0x0 \
--device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.6,addr=3D0x0 \
--blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no=
de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw=
","file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=3Doff,bus=3Dpci.9,addr=3D0x0,drive=3Dlibvirt-1=
-format,id=3Dvirtio-disk1,bootindex=3D1 \
--fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to=
/guest \
--device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D/import/from/=
host,bus=3Dpci.3,addr=3D0x0 \
--netdev user,id=3Dhostnet0 \
--device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55=
,bus=3Dpci.4,addr=3D0x0 \
--netdev user,id=3Dhostnet1 \
--device e1000e,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:44:66,bus=3Dp=
ci.5,addr=3D0x0 \
--device virtio-input-host-pci,id=3Dinput0,evdev=3D/dev/input/event1234,bus=
=3Dpci.12,addr=3D0x0 \
--device virtio-mouse-pci,id=3Dinput1,bus=3Dpci.13,addr=3D0x0 \
--device virtio-keyboard-pci,id=3Dinput2,bus=3Dpci.14,addr=3D0x0 \
--device virtio-tablet-pci,id=3Dinput3,bus=3Dpci.15,addr=3D0x0 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-vga,id=3Dvideo0,max_outputs=3D1,bus=3Dpcie.0,addr=3D0x1 \
--global ICH9-LPC.noreboot=3Doff \
--watchdog-action reset \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.10,addr=3D0x0 \
--object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \
--device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,max-bytes=3D123,period=3D12=
34,bus=3Dpci.11,addr=3D0x0 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/q35-pcie.x86_64-4.2.0.xml b/tests/qemuxm=
lconfdata/q35-pcie.x86_64-4.2.0.xml
deleted file mode 100644
index 05904c1bf1..0000000000
--- a/tests/qemuxmlconfdata/q35-pcie.x86_64-4.2.0.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<domain type=3D'qemu'>
-  <name>q35-test</name>
-  <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
-  <memory unit=3D'KiB'>2097152</memory>
-  <currentMemory unit=3D'KiB'>2097152</currentMemory>
-  <vcpu placement=3D'static' cpuset=3D'0-1'>2</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-q35-4.2'>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'vdb' bus=3D'virtio'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x09' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </disk>
-    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'2'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'3' port=3D'0x10'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'4' port=3D'0x11'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'5' port=3D'0x12'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'pci' index=3D'6' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'6' port=3D'0x13'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x3'/>
-    </controller>
-    <controller type=3D'pci' index=3D'7' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'7' port=3D'0x14'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x4'/>
-    </controller>
-    <controller type=3D'pci' index=3D'8' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'8' port=3D'0x15'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x5'/>
-    </controller>
-    <controller type=3D'pci' index=3D'9' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'9' port=3D'0x16'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x6'/>
-    </controller>
-    <controller type=3D'pci' index=3D'10' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'10' port=3D'0x17'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x7'/>
-    </controller>
-    <controller type=3D'pci' index=3D'11' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'11' port=3D'0x18'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'12' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'12' port=3D'0x19'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'13' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'13' port=3D'0x1a'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'pci' index=3D'14' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'14' port=3D'0x1b'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x3'/>
-    </controller>
-    <controller type=3D'pci' index=3D'15' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'15' port=3D'0x1c'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x4'/>
-    </controller>
-    <controller type=3D'virtio-serial' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x06' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x07' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'usb' index=3D'0' model=3D'nec-xhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x08' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'sata' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
-    </controller>
-    <filesystem type=3D'mount' accessmode=3D'passthrough'>
-      <source dir=3D'/export/to/guest'/>
-      <target dir=3D'/import/from/host'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </filesystem>
-    <interface type=3D'user'>
-      <mac address=3D'00:11:22:33:44:55'/>
-      <model type=3D'virtio'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </interface>
-    <interface type=3D'user'>
-      <mac address=3D'00:11:22:33:44:66'/>
-      <model type=3D'e1000e'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </interface>
-    <input type=3D'passthrough' bus=3D'virtio'>
-      <source evdev=3D'/dev/input/event1234'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0c' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </input>
-    <input type=3D'mouse' bus=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0d' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </input>
-    <input type=3D'keyboard' bus=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0e' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </input>
-    <input type=3D'tablet' bus=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0f' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </input>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <audio id=3D'1' type=3D'none'/>
-    <video>
-      <model type=3D'virtio' heads=3D'1' primary=3D'yes'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
-    </video>
-    <watchdog model=3D'itco' action=3D'reset'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0a' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </memballoon>
-    <rng model=3D'virtio'>
-      <rate bytes=3D'123' period=3D'1234'/>
-      <backend model=3D'random'>/dev/urandom</backend>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0b' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </rng>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-4.2.0.args=
 b/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-4.2.0.args
deleted file mode 100644
index 556db0a8cb..0000000000
--- a/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-4.2.0.args
+++ /dev/null
@@ -1,63 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-virt-manager-basic \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-virt-manager-basic/.local/=
share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-virt-manager-basic/.cache=
 \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-virt-manager-basic/.conf=
ig \
-/usr/bin/qemu-system-x86_64 \
--name guest=3Dvirt-manager-basic,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-virt-manager-basic/master-key.aes \
--machine pc-q35-4.2,usb=3Doff,vmport=3Doff,dump-guest-core=3Doff \
--accel kvm \
--cpu qemu64 \
--m size=3D4194304k \
--overcommit mem-lock=3Doff \
--smp 2,sockets=3D2,cores=3D1,threads=3D1 \
--uuid 1b826c23-8767-47ad-a6b5-c83a88277f71 \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc,driftfix=3Dslew \
--global kvm-pit.lost_tick_policy=3Ddelay \
--no-shutdown \
--global ICH9-LPC.disable_s3=3D1 \
--global ICH9-LPC.disable_s4=3D1 \
--boot strict=3Don \
--device pcie-root-port,port=3D16,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multi=
function=3Don,addr=3D0x2 \
--device pcie-root-port,port=3D17,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x2.0x1 \
--device pcie-root-port,port=3D18,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x2.0x2 \
--device pcie-root-port,port=3D19,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=
=3D0x2.0x3 \
--device pcie-root-port,port=3D20,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr=
=3D0x2.0x4 \
--device pcie-root-port,port=3D21,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr=
=3D0x2.0x5 \
--device nec-usb-xhci,id=3Dusb,bus=3Dpci.2,addr=3D0x0 \
--device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.3,addr=3D0x0 \
--blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/basic.qcow=
2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}=
' \
--blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco=
w2","file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=3Doff,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1=
-format,id=3Dvirtio-disk0,bootindex=3D1 \
--netdev user,id=3Dhostnet0 \
--device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:9a:e6:c6=
,bus=3Dpci.1,addr=3D0x0 \
--chardev pty,id=3Dcharserial0 \
--device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \
--chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \
--device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel=
0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \
--chardev spicevmc,id=3Dcharchannel1,name=3Dvdagent \
--device virtserialport,bus=3Dvirtio-serial0.0,nr=3D2,chardev=3Dcharchannel=
1,id=3Dchannel1,name=3Dcom.redhat.spice.0 \
--device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \
--audiodev '{"id":"audio1","driver":"spice"}' \
--spice port=3D5901,addr=3D127.0.0.1,image-compression=3Doff,seamless-migra=
tion=3Don \
--device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size=
=3D67108864,vram64_size_mb=3D0,vgamem_mb=3D16,bus=3Dpcie.0,addr=3D0x1 \
--device ich9-intel-hda,id=3Dsound0,bus=3Dpcie.0,addr=3D0x1b \
--device hda-duplex,id=3Dsound0-codec0,bus=3Dsound0.0,cad=3D0,audiodev=3Dau=
dio1 \
--global ICH9-LPC.noreboot=3Doff \
--watchdog-action reset \
--chardev spicevmc,id=3Dcharredir0,name=3Dusbredir \
--device usb-redir,chardev=3Dcharredir0,id=3Dredir0,bus=3Dusb.0,port=3D2 \
--chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \
--device usb-redir,chardev=3Dcharredir1,id=3Dredir1,bus=3Dusb.0,port=3D3 \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-4.2.0.xml =
b/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-4.2.0.xml
deleted file mode 100644
index 25fb639a88..0000000000
--- a/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-4.2.0.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<domain type=3D'kvm'>
-  <name>virt-manager-basic</name>
-  <uuid>1b826c23-8767-47ad-a6b5-c83a88277f71</uuid>
-  <memory unit=3D'KiB'>4194304</memory>
-  <currentMemory unit=3D'KiB'>4194304</currentMemory>
-  <vcpu placement=3D'static'>2</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-q35-4.2'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state=3D'off'/>
-  </features>
-  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
-    <model fallback=3D'forbid'>qemu64</model>
-  </cpu>
-  <clock offset=3D'utc'>
-    <timer name=3D'rtc' tickpolicy=3D'catchup'/>
-    <timer name=3D'pit' tickpolicy=3D'delay'/>
-    <timer name=3D'hpet' present=3D'yes'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <pm>
-    <suspend-to-mem enabled=3D'no'/>
-    <suspend-to-disk enabled=3D'no'/>
-  </pm>
-  <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'/var/lib/libvirt/images/basic.qcow2'/>
-      <target dev=3D'vda' bus=3D'virtio'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </disk>
-    <controller type=3D'usb' index=3D'0' model=3D'nec-xhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'sata' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'virtio-serial' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'1' port=3D'0x10'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'2' port=3D'0x11'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'3' port=3D'0x12'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'4' port=3D'0x13'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x3'/>
-    </controller>
-    <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'5' port=3D'0x14'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x4'/>
-    </controller>
-    <controller type=3D'pci' index=3D'6' model=3D'pcie-root-port'>
-      <model name=3D'pcie-root-port'/>
-      <target chassis=3D'6' port=3D'0x15'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x5'/>
-    </controller>
-    <interface type=3D'user'>
-      <mac address=3D'52:54:00:9a:e6:c6'/>
-      <model type=3D'virtio'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </interface>
-    <serial type=3D'pty'>
-      <target type=3D'isa-serial' port=3D'0'>
-        <model name=3D'isa-serial'/>
-      </target>
-    </serial>
-    <console type=3D'pty'>
-      <target type=3D'serial' port=3D'0'/>
-    </console>
-    <channel type=3D'unix'>
-      <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'spicevmc'>
-      <target type=3D'virtio' name=3D'com.redhat.spice.0'/>
-      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'2=
'/>
-    </channel>
-    <input type=3D'tablet' bus=3D'usb'>
-      <address type=3D'usb' bus=3D'0' port=3D'1'/>
-    </input>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <graphics type=3D'spice' autoport=3D'yes'>
-      <listen type=3D'address'/>
-      <image compression=3D'off'/>
-    </graphics>
-    <sound model=3D'ich9'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1b' f=
unction=3D'0x0'/>
-    </sound>
-    <audio id=3D'1' type=3D'spice'/>
-    <video>
-      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' he=
ads=3D'1' primary=3D'yes'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
-    </video>
-    <redirdev bus=3D'usb' type=3D'spicevmc'>
-      <address type=3D'usb' bus=3D'0' port=3D'2'/>
-    </redirdev>
-    <redirdev bus=3D'usb' type=3D'spicevmc'>
-      <address type=3D'usb' bus=3D'0' port=3D'3'/>
-    </redirdev>
-    <watchdog model=3D'itco' action=3D'reset'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/sound-device.x86_64-4.2.0.args b/tests/q=
emuxmlconfdata/sound-device.x86_64-4.2.0.args
deleted file mode 100644
index 4ba1cbc96a..0000000000
--- a/tests/qemuxmlconfdata/sound-device.x86_64-4.2.0.args
+++ /dev/null
@@ -1,49 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff,pcspk-audiodev=3Dau=
dio1 \
--accel tcg \
--cpu qemu64 \
--m size=3D219136k \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device ES1370,id=3Dsound1,audiodev=3Daudio1,bus=3Dpci.0,addr=3D0x2 \
--device sb16,id=3Dsound2,audiodev=3Daudio1 \
--device AC97,id=3Dsound3,audiodev=3Daudio1,bus=3Dpci.0,addr=3D0x3 \
--device intel-hda,id=3Dsound4,bus=3Dpci.0,addr=3D0x4 \
--device hda-duplex,id=3Dsound4-codec0,bus=3Dsound4.0,cad=3D0,audiodev=3Dau=
dio1 \
--device intel-hda,id=3Dsound5,bus=3Dpci.0,addr=3D0x5 \
--device hda-micro,id=3Dsound5-codec0,bus=3Dsound5.0,cad=3D0,audiodev=3Daud=
io1 \
--device hda-duplex,id=3Dsound5-codec1,bus=3Dsound5.0,cad=3D1,audiodev=3Dau=
dio1 \
--device hda-output,id=3Dsound5-codec2,bus=3Dsound5.0,cad=3D2,audiodev=3Dau=
dio1 \
--device ich9-intel-hda,id=3Dsound6,bus=3Dpci.0,addr=3D0x6 \
--device hda-duplex,id=3Dsound6-codec0,bus=3Dsound6.0,cad=3D0,audiodev=3Dau=
dio1 \
--device ich9-intel-hda,id=3Dsound7,bus=3Dpci.0,addr=3D0x7 \
--device hda-micro,id=3Dsound7-codec0,bus=3Dsound7.0,cad=3D0,audiodev=3Daud=
io1 \
--device hda-duplex,id=3Dsound7-codec1,bus=3Dsound7.0,cad=3D1,audiodev=3Dau=
dio1 \
--device hda-output,id=3Dsound7-codec2,bus=3Dsound7.0,cad=3D2,audiodev=3Dau=
dio1 \
--device usb-audio,id=3Dsound8,audiodev=3Daudio1,multi=3Don,bus=3Dusb.0,por=
t=3D1 \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x8 \
--sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
--msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/sound-device.x86_64-4.2.0.xml b/tests/qe=
muxmlconfdata/sound-device.x86_64-4.2.0.xml
deleted file mode 100644
index f123a7a744..0000000000
--- a/tests/qemuxmlconfdata/sound-device.x86_64-4.2.0.xml
+++ /dev/null
@@ -1,61 +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-i440fx-4.2'>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'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'/>
-    <sound model=3D'pcspk'/>
-    <sound model=3D'es1370'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
-    </sound>
-    <sound model=3D'sb16'/>
-    <sound model=3D'ac97'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
-    </sound>
-    <sound model=3D'ich6'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
-    </sound>
-    <sound model=3D'ich6'>
-      <codec type=3D'micro'/>
-      <codec type=3D'duplex'/>
-      <codec type=3D'output'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
-    </sound>
-    <sound model=3D'ich9'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
-    </sound>
-    <sound model=3D'ich9'>
-      <codec type=3D'micro'/>
-      <codec type=3D'duplex'/>
-      <codec type=3D'output'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07' f=
unction=3D'0x0'/>
-    </sound>
-    <sound model=3D'usb' multichannel=3D'yes'/>
-    <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/qemuxmlconfdata/virtio-options-memballoon-freepage-repor=
ting.x86_64-5.0.0.err b/tests/qemuxmlconfdata/virtio-options-memballoon-fre=
epage-reporting.x86_64-5.0.0.err
deleted file mode 100644
index 81cb56e968..0000000000
--- a/tests/qemuxmlconfdata/virtio-options-memballoon-freepage-reporting.x8=
6_64-5.0.0.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: freePageReporting is not supported by this QEMU=
 binary
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 8e0d47c6fd..e584e0d9e5 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -1354,19 +1354,16 @@ mymain(void)
     /* Validate auto-creation of <audio> for legacy compat */
     g_setenv("QEMU_AUDIO_DRV", "sdl", TRUE);
     g_setenv("SDL_AUDIODRIVER", "esd", TRUE);
-    DO_TEST_CAPS_VER("audio-default-sdl", "4.2.0");
     DO_TEST_CAPS_LATEST("audio-default-sdl");
     g_unsetenv("QEMU_AUDIO_DRV");
     g_unsetenv("SDL_AUDIODRIVER");
=20
     g_setenv("QEMU_AUDIO_DRV", "alsa", TRUE);
     driver.config->vncAllowHostAudio =3D true;
-    DO_TEST_CAPS_VER("audio-default-vnc", "4.2.0");
     DO_TEST_CAPS_LATEST("audio-default-vnc");
     driver.config->vncAllowHostAudio =3D false;
     g_unsetenv("QEMU_AUDIO_DRV");
=20
-    DO_TEST_CAPS_VER("audio-default-spice", "4.2.0");
     DO_TEST_CAPS_LATEST("audio-default-spice");
=20
     g_setenv("QEMU_AUDIO_DRV", "alsa", TRUE);
@@ -1520,7 +1517,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-memaccess-invalid");
     DO_TEST_CAPS_LATEST("hugepages-memaccess");
     DO_TEST_CAPS_LATEST("hugepages-memaccess2");
-    DO_TEST_CAPS_VER_PARSE_ERROR("hugepages-memaccess3", "5.1.0");
     DO_TEST_CAPS_LATEST("hugepages-memaccess3");
     DO_TEST_CAPS_LATEST("hugepages-nvdimm");
     DO_TEST_CAPS_LATEST("nosharepages");
@@ -1584,7 +1580,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd");
     DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-tlsx509-nbd-hostname", "6.2=
.0");
     DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname");
-    DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "5.0.0");
     DO_TEST_CAPS_LATEST("disk-network-http");
     VIR_FREE(driver.config->nbdTLSx509secretUUID);
     VIR_FREE(driver.config->vxhsTLSx509secretUUID);
@@ -1592,7 +1587,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("disk-network-ssh");
     DO_TEST_CAPS_LATEST("disk-no-boot");
     DO_TEST_CAPS_LATEST("disk-nvme");
-    DO_TEST_CAPS_VER("disk-vhostuser-numa", "4.2.0");
     DO_TEST_CAPS_LATEST("disk-vhostuser-numa");
     DO_TEST_CAPS_LATEST("disk-vhostuser");
     DO_TEST_CAPS_ARCH_LATEST_FULL("disk-vhostvdpa", "x86_64",
@@ -2065,7 +2059,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("balloon-device-auto");
     DO_TEST_CAPS_LATEST("balloon-device-period");
=20
-    DO_TEST_CAPS_VER("sound-device", "4.2.0");
     DO_TEST_CAPS_LATEST("sound-device");
     DO_TEST_CAPS_LATEST("fs9p");
     DO_TEST_CAPS_ARCH_LATEST("fs9p-ccw", "s390x");
@@ -2140,7 +2133,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("iothreads-ids-partial");
     DO_TEST_CAPS_LATEST("iothreads-ids-pool-sizes");
     DO_TEST_CAPS_LATEST("iothreads-disk");
-    DO_TEST_CAPS_ARCH_VER("iothreads-disk-virtio-ccw", "s390x", "4.2.0");
     DO_TEST_CAPS_VER("iothreads-virtio-scsi-pci", "5.2.0");
     DO_TEST_CAPS_LATEST("iothreads-virtio-scsi-pci");
     DO_TEST_CAPS_ARCH_LATEST("iothreads-virtio-scsi-ccw", "s390x");
@@ -2174,9 +2166,6 @@ mymain(void)
=20
     /* host-model cpu expansion depends on the cpu reported by qemu and th=
us
      * we invoke it for all real capability dumps we have */
-    DO_TEST_CAPS_VER("cpu-host-model-kvm", "4.2.0");
-    DO_TEST_CAPS_VER("cpu-host-model-kvm", "5.0.0");
-    DO_TEST_CAPS_VER("cpu-host-model-kvm", "5.1.0");
     DO_TEST_CAPS_VER("cpu-host-model-kvm", "5.2.0");
     DO_TEST_CAPS_VER("cpu-host-model-kvm", "6.0.0");
     DO_TEST_CAPS_VER("cpu-host-model-kvm", "6.1.0");
@@ -2187,9 +2176,6 @@ mymain(void)
     DO_TEST_CAPS_VER("cpu-host-model-kvm", "8.0.0");
     DO_TEST_CAPS_VER("cpu-host-model-kvm", "8.1.0");
=20
-    DO_TEST_CAPS_VER("cpu-host-model-tcg", "4.2.0");
-    DO_TEST_CAPS_VER("cpu-host-model-tcg", "5.0.0");
-    DO_TEST_CAPS_VER("cpu-host-model-tcg", "5.1.0");
     DO_TEST_CAPS_VER("cpu-host-model-tcg", "5.2.0");
     DO_TEST_CAPS_VER("cpu-host-model-tcg", "6.0.0");
     DO_TEST_CAPS_VER("cpu-host-model-tcg", "6.1.0");
@@ -2200,9 +2186,6 @@ mymain(void)
     DO_TEST_CAPS_VER("cpu-host-model-tcg", "8.0.0");
     DO_TEST_CAPS_VER("cpu-host-model-tcg", "8.1.0");
=20
-    DO_TEST_CAPS_VER("cpu-host-model-fallback-kvm", "4.2.0");
-    DO_TEST_CAPS_VER("cpu-host-model-fallback-kvm", "5.0.0");
-    DO_TEST_CAPS_VER("cpu-host-model-fallback-kvm", "5.1.0");
     DO_TEST_CAPS_VER("cpu-host-model-fallback-kvm", "5.2.0");
     DO_TEST_CAPS_VER("cpu-host-model-fallback-kvm", "6.0.0");
     DO_TEST_CAPS_VER("cpu-host-model-fallback-kvm", "6.1.0");
@@ -2213,9 +2196,6 @@ mymain(void)
     DO_TEST_CAPS_VER("cpu-host-model-fallback-kvm", "8.0.0");
     DO_TEST_CAPS_VER("cpu-host-model-fallback-kvm", "8.1.0");
=20
-    DO_TEST_CAPS_VER("cpu-host-model-fallback-tcg", "4.2.0");
-    DO_TEST_CAPS_VER("cpu-host-model-fallback-tcg", "5.0.0");
-    DO_TEST_CAPS_VER("cpu-host-model-fallback-tcg", "5.1.0");
     DO_TEST_CAPS_VER("cpu-host-model-fallback-tcg", "5.2.0");
     DO_TEST_CAPS_VER("cpu-host-model-fallback-tcg", "6.0.0");
     DO_TEST_CAPS_VER("cpu-host-model-fallback-tcg", "6.1.0");
@@ -2226,9 +2206,6 @@ mymain(void)
     DO_TEST_CAPS_VER("cpu-host-model-fallback-tcg", "8.0.0");
     DO_TEST_CAPS_VER("cpu-host-model-fallback-tcg", "8.1.0");
=20
-    DO_TEST_CAPS_VER("cpu-host-model-nofallback-kvm", "4.2.0");
-    DO_TEST_CAPS_VER("cpu-host-model-nofallback-kvm", "5.0.0");
-    DO_TEST_CAPS_VER("cpu-host-model-nofallback-kvm", "5.1.0");
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-kvm", "5.2.0");
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-kvm", "6.0.0");
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-kvm", "6.1.0");
@@ -2239,9 +2216,6 @@ mymain(void)
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-kvm", "8.0.0");
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-kvm", "8.1.0");
=20
-    DO_TEST_CAPS_VER("cpu-host-model-nofallback-tcg", "4.2.0");
-    DO_TEST_CAPS_VER("cpu-host-model-nofallback-tcg", "5.0.0");
-    DO_TEST_CAPS_VER("cpu-host-model-nofallback-tcg", "5.1.0");
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-tcg", "5.2.0");
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-tcg", "6.0.0");
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-tcg", "6.1.0");
@@ -2389,7 +2363,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST_PPC64("pseries-hostdevs-2");
     DO_TEST_CAPS_LATEST_PPC64("pseries-hostdevs-3");
=20
-    DO_TEST_CAPS_ARCH_VER("pseries-features", "ppc64", "4.2.0");
     DO_TEST_CAPS_LATEST_PPC64("pseries-features");
=20
     DO_TEST_CAPS_LATEST_PARSE_ERROR("pseries-features-invalid-machine");
@@ -2509,26 +2482,15 @@ mymain(void)
     DO_TEST_CAPS_LATEST_PARSE_ERROR("q35-dmi-bad-address2");
     DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable");
     DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-enable");
-    DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-disable", "5=
.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-enable", "5.=
1.0");
     DO_TEST_CAPS_LATEST("q35-usb2");
     DO_TEST_CAPS_LATEST("q35-usb2-multi");
     DO_TEST_CAPS_LATEST("q35-usb2-reorder");
=20
-    /* Note: The real caps versions of the following tests based on qemu-4=
.2.0
-     * were added as a comparison point between fake caps testing and real=
 caps
-     * testing and don't have any other specific purpose */
-    /* verify that devices with pcie capability are assigned to a pcie slo=
t */
-    DO_TEST_CAPS_VER("q35-pcie", "4.2.0");
     DO_TEST_CAPS_LATEST("q35-pcie");
     /* same as q35-pcie, but all PCI controllers are added automatically */
-    DO_TEST_CAPS_VER("q35-pcie-autoadd", "4.2.0");
     DO_TEST_CAPS_LATEST("q35-pcie-autoadd");
-    DO_TEST_CAPS_VER("q35-default-devices-only", "4.2.0");
     DO_TEST_CAPS_LATEST("q35-default-devices-only");
-    DO_TEST_CAPS_VER("q35-multifunction", "4.2.0");
     DO_TEST_CAPS_LATEST("q35-multifunction");
-    DO_TEST_CAPS_VER("q35-virt-manager-basic", "4.2.0");
     DO_TEST_CAPS_LATEST("q35-virt-manager-basic");
=20
     /* Test automatic and manual setting of pcie-root-port attributes */
@@ -2571,7 +2533,6 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST("hostdev-scsi-vhost-scsi-ccw", "s390x");
     DO_TEST_CAPS_LATEST("hostdev-scsi-vhost-scsi-pci");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-scsi-vhost-scsi-pci-boot-fail=
");
-    DO_TEST_CAPS_VER("hostdev-scsi-vhost-scsi-pcie", "4.2.0");
     DO_TEST_CAPS_LATEST("hostdev-scsi-vhost-scsi-pcie");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-scsi-duplicate");
=20
@@ -2592,7 +2553,6 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-basic", "aarch64");
     DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-virtio", "aarch64");
=20
-    DO_TEST_CAPS_ARCH_VER("aarch64-virt-virtio", "aarch64", "4.2.0");
     DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-virtio", "aarch64");
=20
     /* Example of using virtio-pci with no explicit PCI controller
@@ -2602,7 +2562,6 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST("aarch64-video-default", "aarch64");
     DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-default-nic", "aarch64");
     DO_TEST_CAPS_ARCH_LATEST("aarch64-cpu-passthrough", "aarch64");
-    DO_TEST_GIC("aarch64-gic-none", "4.2.0", GIC_NONE);
     DO_TEST_GIC("aarch64-gic-none", "latest", GIC_NONE);
     DO_TEST_GIC("aarch64-gic-none-v2", "latest", GIC_V2);
     DO_TEST_GIC("aarch64-gic-none-v3", "latest", GIC_V3);
@@ -2611,7 +2570,6 @@ mymain(void)
                                ARG_GIC, GIC_BOTH,
                                ARG_QEMU_CAPS_DEL, QEMU_CAPS_KVM, QEMU_CAPS=
_LAST,
                                ARG_END);
-    DO_TEST_GIC("aarch64-gic-default", "4.2.0", GIC_NONE);
     DO_TEST_GIC("aarch64-gic-default", "latest", GIC_NONE);
     DO_TEST_GIC("aarch64-gic-default-v2", "latest", GIC_V2);
     DO_TEST_GIC("aarch64-gic-default-v3", "latest", GIC_V3);
@@ -2661,7 +2619,6 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("pvpanic-pci-invalid-address-aarc=
h64", "aarch64");
     DO_TEST_CAPS_ARCH_LATEST("pvpanic-pci-no-address-aarch64", "aarch64");
=20
-    DO_TEST_CAPS_ARCH_VER_FULL("fips-enabled", "x86_64", "5.1.0", ARG_FLAG=
S, FLAG_FIPS_HOST);
     DO_TEST_CAPS_ARCH_LATEST_FULL("fips-enabled", "x86_64", ARG_FLAGS, FLA=
G_FIPS_HOST);
=20
     DO_TEST_CAPS_LATEST("shmem-plain-doorbell");
@@ -2790,7 +2747,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("virtio-options-input-packed");
     DO_TEST_CAPS_LATEST("virtio-options-memballoon-packed");
     DO_TEST_CAPS_LATEST("virtio-options-memballoon-freepage-reporting");
-    DO_TEST_CAPS_VER_PARSE_ERROR("virtio-options-memballoon-freepage-repor=
ting", "5.0.0");
     DO_TEST_CAPS_LATEST("virtio-options-net-packed");
     DO_TEST_CAPS_LATEST("virtio-options-rng-packed");
     DO_TEST_CAPS_LATEST("virtio-options-video-packed");
@@ -2950,7 +2906,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("disk-active-commit");
     DO_TEST_CAPS_LATEST("disk-mirror-old");
     DO_TEST_CAPS_LATEST("disk-mirror");
-    DO_TEST_CAPS_VER("disk-network-vxhs", "5.0.0");
     DO_TEST_CAPS_LATEST("downscript");
     DO_TEST_CAPS_LATEST("hostdev-mdev-display");
     DO_TEST_CAPS_LATEST("hostdev-scsi-autogen-address");
--=20
2.44.2