From nobody Tue Jun  9 21:16:12 2026
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates
 38.145.34.151 as permitted sender) client-ip=38.145.34.151;
 envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org;
Authentication-Results: mx.zohomail.com;
	dkim=fail;
	spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151
 as permitted sender)  smtp.mailfrom=devel-bounces@lists.libvirt.org;
	dmarc=pass(p=reject dis=none)  header.from=lists.libvirt.org
ARC-Seal: i=1; a=rsa-sha256; t=1777986074; cv=none;
	d=zohomail.com; s=zohoarc;
	b=iW2ZMbfTzcRy4euz4Xfhp4M8FpdDSOXx+BR0IjmHMkxUHynGDdke2COQ51lkrNmHmmONdNvrSk+IZ9tWq1v4dlH5kOr2E2A+CxzRBnpMW6mJ18eN9pvZi7MJ4H9PbDxEgf5TWf6p4/Lmnojas8euGoBCsh1sR4h9eGouleX/G78=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1777986074;
 h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Subject:Subject:To:To:Message-Id:Cc;
	bh=XP6DD3qwBXXX7xG2XbGSRBR4gzbTRdm0Egr/SDuAheM=;
	b=edOgF7frTXaifx5C7+ORY+srn5PujaZZpoS35Ksf6c/YDsMUbw1d93UlnsFHYn0h69IJH7KhXRwKaz6UEwKtO8KP+iMjX9DOhZ/HqYhU9TbVtV7jocSFTWXuziGC6bKElvUjD52+rJ6G4uhbwZm1icRTNBsWlqP83Czib7etvso=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=fail;
	spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151
 as permitted sender)  smtp.mailfrom=devel-bounces@lists.libvirt.org;
	dmarc=pass header.from=<devel@lists.libvirt.org> (p=reject dis=none)
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by
 mx.zohomail.com
	with SMTPS id 1777986074779571.1104627917576;
 Tue, 5 May 2026 06:01:14 -0700 (PDT)
Received: by lists.libvirt.org (Postfix, from userid 993)
	id A3E8441828; Tue,  5 May 2026 09:01:13 -0400 (EDT)
Received: from [172.19.199.9] (unknown [10.16.107.18])
	by lists.libvirt.org (Postfix) with ESMTP id F3C304195C;
	Tue,  5 May 2026 08:55:41 -0400 (EDT)
Received: by lists.libvirt.org (Postfix, from userid 993)
	id 416203F281; Tue,  5 May 2026 08:55:31 -0400 (EDT)
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.129.124])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest
 SHA256)
	(No client certificate requested)
	by lists.libvirt.org (Postfix) with ESMTPS id A44973F2F4
	for <devel@lists.libvirt.org>; Tue,  5 May 2026 08:55:26 -0400 (EDT)
Received: from mx-prod-mc-05.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-277-uZ9uGvyFNSCQxvyH0woMpQ-1; Tue,
 05 May 2026 08:55:24 -0400
Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com
 (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17])
	(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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
 id C814D1956095
	for <devel@lists.libvirt.org>; Tue,  5 May 2026 12:55:23 +0000 (UTC)
Received: from moe (unknown [10.43.3.236])
	by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
 id C5534196B09E
	for <devel@lists.libvirt.org>; Tue,  5 May 2026 12:55:22 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID,
	DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,
	RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no
	autolearn_force=no version=4.0.1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1777985726;
	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;
	bh=XP6DD3qwBXXX7xG2XbGSRBR4gzbTRdm0Egr/SDuAheM=;
	b=gFQaYgNY3Vek0WYv/lmVjixJ4unelFGarNZfulri75u+jH60BEHcN5paI6ghuAJC3Fsemk
	FAWeftqKGbEpWbFtxhdQxohIukFzkSIG5CBtgOxFG2sCrAlf2+QmXfUVKFEBY6ONjHEt+n
	tavd/IR5kDtW0dOt65DzxIBOOApZf10=
X-MC-Unique: uZ9uGvyFNSCQxvyH0woMpQ-1
X-Mimecast-MFC-AGG-ID: uZ9uGvyFNSCQxvyH0woMpQ_1777985723
To: devel@lists.libvirt.org
Subject: [PATCH] qemuxmlconftest: Add new cpu host model expansions tests
Date: Tue,  5 May 2026 14:55:20 +0200
Message-ID: 
 <ee0e633a8e23a10dcb72a55392915338079b4e1c.1777985720.git.mprivozn@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17
X-Mimecast-Spam-Score: 0
X-Mimecast-MFC-PROC-ID: UWeF5nNfhJrYEXoUckF93R9KzFLSeQWdk5LmLGwbF9s_1777985723
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Message-ID-Hash: T3YGWJLWFXMUFDNDSUF4KEMLSQ6GWMBU
X-Message-ID-Hash: T3YGWJLWFXMUFDNDSUF4KEMLSQ6GWMBU
X-MailFrom: mprivozn@redhat.com
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop;
 banned-address; header-match-devel.lists.libvirt.org-0; emergency;
 member-moderation; nonmember-moderation; administrivia; implicit-dest;
 max-recipients; max-size; news-moderation; no-subject; digests;
 suspicious-header
X-Mailman-Version: 3.3.10
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/T3YGWJLWFXMUFDNDSUF4KEMLSQ6GWMBU/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Owner: <mailto:devel-owner@lists.libvirt.org>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
From: Michal Privoznik via Devel <devel@lists.libvirt.org>
Reply-To: Michal Privoznik <mprivozn@redhat.com>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1777986079186154100
Content-Type: text/plain; charset="utf-8"; x-default="true"

From: Michal Privoznik <mprivozn@redhat.com>

In qemuxmlconftest there's a section which aim on testing
'host-model' cpu mode expansion. Since this depends on what QEMU
reports (and thus can change with its version) we have a test
case for each QEMU version supported. Unfortunately, when adding
capabilities for new QEMUs this section was forgotten. Add
missing test cases (10.2.0 and 11.0.0).

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---
 ...host-model-fallback-kvm.x86_64-10.2.0.args | 33 +++++++++++++
 ...-host-model-fallback-kvm.x86_64-10.2.0.xml | 29 +++++++++++
 ...host-model-fallback-kvm.x86_64-11.0.0.args | 33 +++++++++++++
 ...-host-model-fallback-kvm.x86_64-11.0.0.xml | 29 +++++++++++
 ...host-model-fallback-tcg.x86_64-10.2.0.args | 33 +++++++++++++
 ...-host-model-fallback-tcg.x86_64-10.2.0.xml | 29 +++++++++++
 ...host-model-fallback-tcg.x86_64-11.0.0.args | 33 +++++++++++++
 ...-host-model-fallback-tcg.x86_64-11.0.0.xml | 29 +++++++++++
 .../cpu-host-model-kvm.x86_64-10.2.0.args     | 38 +++++++++++++++
 .../cpu-host-model-kvm.x86_64-10.2.0.xml      | 48 +++++++++++++++++++
 .../cpu-host-model-kvm.x86_64-11.0.0.args     | 38 +++++++++++++++
 .../cpu-host-model-kvm.x86_64-11.0.0.xml      | 48 +++++++++++++++++++
 ...st-model-nofallback-kvm.x86_64-10.2.0.args | 33 +++++++++++++
 ...ost-model-nofallback-kvm.x86_64-10.2.0.xml | 29 +++++++++++
 ...st-model-nofallback-kvm.x86_64-11.0.0.args | 33 +++++++++++++
 ...ost-model-nofallback-kvm.x86_64-11.0.0.xml | 29 +++++++++++
 ...st-model-nofallback-tcg.x86_64-10.2.0.args | 33 +++++++++++++
 ...ost-model-nofallback-tcg.x86_64-10.2.0.xml | 29 +++++++++++
 ...st-model-nofallback-tcg.x86_64-11.0.0.args | 33 +++++++++++++
 ...ost-model-nofallback-tcg.x86_64-11.0.0.xml | 29 +++++++++++
 .../cpu-host-model-tcg.x86_64-10.2.0.args     | 38 +++++++++++++++
 .../cpu-host-model-tcg.x86_64-10.2.0.xml      | 48 +++++++++++++++++++
 .../cpu-host-model-tcg.x86_64-11.0.0.args     | 38 +++++++++++++++
 .../cpu-host-model-tcg.x86_64-11.0.0.xml      | 48 +++++++++++++++++++
 tests/qemuxmlconftest.c                       | 12 +++++
 25 files changed, 852 insertions(+)
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6=
4-10.2.0.args
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6=
4-10.2.0.xml
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6=
4-11.0.0.args
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6=
4-11.0.0.xml
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6=
4-10.2.0.args
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6=
4-10.2.0.xml
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6=
4-11.0.0.args
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6=
4-11.0.0.xml
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.2.0.=
args
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.2.0.=
xml
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-11.0.0.=
args
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-11.0.0.=
xml
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86=
_64-10.2.0.args
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86=
_64-10.2.0.xml
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86=
_64-11.0.0.args
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86=
_64-11.0.0.xml
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86=
_64-10.2.0.args
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86=
_64-10.2.0.xml
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86=
_64-11.0.0.args
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86=
_64-11.0.0.xml
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.2.0.=
args
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.2.0.=
xml
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-11.0.0.=
args
 create mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-11.0.0.=
xml

diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.2.=
0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.2.0.ar=
gs
new file mode 100644
index 0000000000..309dc80244
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.2.0.args
@@ -0,0 +1,33 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=3DQEMUGuest1,debug-threads=3Don \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc-i440fx-10.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp=
c.ram,acpi=3Doff \
+-accel kvm \
+-cpu EPYC-Turin,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=
=3Don,spec-ctrl=3Don,stibp=3Don,flush-l1d=3Don,ssbd=3Don,virt-ssbd=3Don,tsa=
-sq-no=3Don,tsa-l1-no=3Don,pcid=3Doff,rdseed=3Doff,la57=3Doff \
+-m size=3D219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
+-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 \
+-boot strict=3Don \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0=
x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x2"}' \
+-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-10.2.=
0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.2.0.xml
new file mode 100644
index 0000000000..e7b26bbfca
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.2.0.xml
@@ -0,0 +1,29 @@
+<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-10.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-11.0.=
0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-11.0.0.ar=
gs
new file mode 100644
index 0000000000..ed23d2bec4
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-11.0.0.args
@@ -0,0 +1,33 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=3DQEMUGuest1,debug-threads=3Don \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi=
=3Doff \
+-accel kvm \
+-cpu EPYC-Turin,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=
=3Don,spec-ctrl=3Don,stibp=3Don,flush-l1d=3Don,ssbd=3Don,virt-ssbd=3Don,tsa=
-sq-no=3Don,tsa-l1-no=3Don,pcid=3Doff,rdseed=3Doff,la57=3Doff \
+-m size=3D219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
+-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 \
+-boot strict=3Don \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0=
x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x2"}' \
+-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-11.0.=
0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-11.0.0.xml
new file mode 100644
index 0000000000..8772918cdc
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-11.0.0.xml
@@ -0,0 +1,29 @@
+<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'>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-10.2.=
0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.2.0.ar=
gs
new file mode 100644
index 0000000000..4daf8c40c4
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.2.0.args
@@ -0,0 +1,33 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=3DQEMUGuest1,debug-threads=3Don \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc-i440fx-10.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp=
c.ram,acpi=3Doff \
+-accel tcg \
+-cpu EPYC,monitor=3Don,x2apic=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=
=3Don,mpx=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,cmpccxadd=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3D=
on,3dnow=3Don,xsaveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,no-nested-data-bp=3Don,null-sel-clr-base=3Don,vme=3Doff,xsavec=3Doff=
,misalignsse=3Doff,osvw=3Doff,topoext=3Doff,fxsr-opt=3Doff,nrip-save=3Doff \
+-m size=3D219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
+-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 \
+-boot strict=3Don \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0=
x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x2"}' \
+-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-10.2.=
0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.2.0.xml
new file mode 100644
index 0000000000..72c8099893
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.2.0.xml
@@ -0,0 +1,29 @@
+<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-10.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-11.0.=
0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-11.0.0.ar=
gs
new file mode 100644
index 0000000000..443de62f69
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-11.0.0.args
@@ -0,0 +1,33 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=3DQEMUGuest1,debug-threads=3Don \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi=
=3Doff \
+-accel tcg \
+-cpu EPYC,monitor=3Don,x2apic=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=
=3Don,mpx=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,cmpccxadd=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3D=
on,3dnow=3Don,xsaveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,no-nested-data-bp=3Don,null-sel-clr-base=3Don,vme=3Doff,xsavec=3Doff=
,misalignsse=3Doff,osvw=3Doff,topoext=3Doff,fxsr-opt=3Doff,nrip-save=3Doff \
+-m size=3D219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
+-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 \
+-boot strict=3Don \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0=
x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x2"}' \
+-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-11.0.=
0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-11.0.0.xml
new file mode 100644
index 0000000000..9a1c602064
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-11.0.0.xml
@@ -0,0 +1,29 @@
+<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'>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-10.2.0.args b/=
tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.2.0.args
new file mode 100644
index 0000000000..34e873b4c8
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.2.0.args
@@ -0,0 +1,38 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=3DQEMUGuest1,debug-threads=3Don \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc-q35-10.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r=
am,acpi=3Doff \
+-accel kvm \
+-cpu EPYC-Turin,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=
=3Don,spec-ctrl=3Don,stibp=3Don,flush-l1d=3Don,ssbd=3Don,virt-ssbd=3Don,tsa=
-sq-no=3Don,tsa-l1-no=3Don,pcid=3Doff,rdseed=3Doff,la57=3Doff \
+-m size=3D219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
+-overcommit mem-lock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-boot strict=3Don \
+-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus=
":"pcie.0","multifunction":true,"addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus=
":"pcie.0","addr":"0x1.0x1"}' \
+-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu=
s":"pcie.0","addr":"0x1.0x2"}' \
+-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add=
r":"0x0"}' \
+-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-10.2.0.xml b/t=
ests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.2.0.xml
new file mode 100644
index 0000000000..ca1f5bef67
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.2.0.xml
@@ -0,0 +1,48 @@
+<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-10.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-11.0.0.args b/=
tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-11.0.0.args
new file mode 100644
index 0000000000..df7407e32b
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-11.0.0.args
@@ -0,0 +1,38 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=3DQEMUGuest1,debug-threads=3Don \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi=
=3Doff \
+-accel kvm \
+-cpu EPYC-Turin,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=
=3Don,spec-ctrl=3Don,stibp=3Don,flush-l1d=3Don,ssbd=3Don,virt-ssbd=3Don,tsa=
-sq-no=3Don,tsa-l1-no=3Don,pcid=3Doff,rdseed=3Doff,la57=3Doff \
+-m size=3D219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
+-overcommit mem-lock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-boot strict=3Don \
+-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus=
":"pcie.0","multifunction":true,"addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus=
":"pcie.0","addr":"0x1.0x1"}' \
+-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu=
s":"pcie.0","addr":"0x1.0x2"}' \
+-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add=
r":"0x0"}' \
+-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-11.0.0.xml b/t=
ests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-11.0.0.xml
new file mode 100644
index 0000000000..677b0f16ef
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-11.0.0.xml
@@ -0,0 +1,48 @@
+<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'q35'>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-10.=
2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.2.=
0.args
new file mode 100644
index 0000000000..309dc80244
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.2.0.args
@@ -0,0 +1,33 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=3DQEMUGuest1,debug-threads=3Don \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc-i440fx-10.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp=
c.ram,acpi=3Doff \
+-accel kvm \
+-cpu EPYC-Turin,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=
=3Don,spec-ctrl=3Don,stibp=3Don,flush-l1d=3Don,ssbd=3Don,virt-ssbd=3Don,tsa=
-sq-no=3Don,tsa-l1-no=3Don,pcid=3Doff,rdseed=3Doff,la57=3Doff \
+-m size=3D219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
+-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 \
+-boot strict=3Don \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0=
x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x2"}' \
+-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-10.=
2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.2.0=
.xml
new file mode 100644
index 0000000000..e7b26bbfca
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.2.0.xml
@@ -0,0 +1,29 @@
+<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-10.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-11.=
0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-11.0.=
0.args
new file mode 100644
index 0000000000..ed23d2bec4
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-11.0.0.args
@@ -0,0 +1,33 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=3DQEMUGuest1,debug-threads=3Don \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi=
=3Doff \
+-accel kvm \
+-cpu EPYC-Turin,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=
=3Don,spec-ctrl=3Don,stibp=3Don,flush-l1d=3Don,ssbd=3Don,virt-ssbd=3Don,tsa=
-sq-no=3Don,tsa-l1-no=3Don,pcid=3Doff,rdseed=3Doff,la57=3Doff \
+-m size=3D219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
+-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 \
+-boot strict=3Don \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0=
x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x2"}' \
+-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-11.=
0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-11.0.0=
.xml
new file mode 100644
index 0000000000..8772918cdc
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-11.0.0.xml
@@ -0,0 +1,29 @@
+<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'>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-10.=
2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.2.=
0.args
new file mode 100644
index 0000000000..4daf8c40c4
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.2.0.args
@@ -0,0 +1,33 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=3DQEMUGuest1,debug-threads=3Don \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc-i440fx-10.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp=
c.ram,acpi=3Doff \
+-accel tcg \
+-cpu EPYC,monitor=3Don,x2apic=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=
=3Don,mpx=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,cmpccxadd=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3D=
on,3dnow=3Don,xsaveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,no-nested-data-bp=3Don,null-sel-clr-base=3Don,vme=3Doff,xsavec=3Doff=
,misalignsse=3Doff,osvw=3Doff,topoext=3Doff,fxsr-opt=3Doff,nrip-save=3Doff \
+-m size=3D219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
+-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 \
+-boot strict=3Don \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0=
x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x2"}' \
+-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-10.=
2.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.2.0=
.xml
new file mode 100644
index 0000000000..72c8099893
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.2.0.xml
@@ -0,0 +1,29 @@
+<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-10.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-11.=
0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-11.0.=
0.args
new file mode 100644
index 0000000000..443de62f69
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-11.0.0.args
@@ -0,0 +1,33 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=3DQEMUGuest1,debug-threads=3Don \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi=
=3Doff \
+-accel tcg \
+-cpu EPYC,monitor=3Don,x2apic=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=
=3Don,mpx=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,cmpccxadd=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3D=
on,3dnow=3Don,xsaveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,no-nested-data-bp=3Don,null-sel-clr-base=3Don,vme=3Doff,xsavec=3Doff=
,misalignsse=3Doff,osvw=3Doff,topoext=3Doff,fxsr-opt=3Doff,nrip-save=3Doff \
+-m size=3D219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
+-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 \
+-boot strict=3Don \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0=
x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x2"}' \
+-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-11.=
0.0.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-11.0.0=
.xml
new file mode 100644
index 0000000000..9a1c602064
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-11.0.0.xml
@@ -0,0 +1,29 @@
+<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'>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-10.2.0.args b/=
tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.2.0.args
new file mode 100644
index 0000000000..627ee603f4
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.2.0.args
@@ -0,0 +1,38 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=3DQEMUGuest1,debug-threads=3Don \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc-q35-10.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r=
am,acpi=3Doff \
+-accel tcg \
+-cpu EPYC,monitor=3Don,x2apic=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=
=3Don,mpx=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,cmpccxadd=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3D=
on,3dnow=3Don,xsaveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,no-nested-data-bp=3Don,null-sel-clr-base=3Don,vme=3Doff,xsavec=3Doff=
,misalignsse=3Doff,osvw=3Doff,topoext=3Doff,fxsr-opt=3Doff,nrip-save=3Doff \
+-m size=3D219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
+-overcommit mem-lock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-boot strict=3Don \
+-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus=
":"pcie.0","multifunction":true,"addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus=
":"pcie.0","addr":"0x1.0x1"}' \
+-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu=
s":"pcie.0","addr":"0x1.0x2"}' \
+-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add=
r":"0x0"}' \
+-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-10.2.0.xml b/t=
ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.2.0.xml
new file mode 100644
index 0000000000..624968a7e9
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.2.0.xml
@@ -0,0 +1,48 @@
+<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-10.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-11.0.0.args b/=
tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-11.0.0.args
new file mode 100644
index 0000000000..688a217c3c
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-11.0.0.args
@@ -0,0 +1,38 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=3DQEMUGuest1,debug-threads=3Don \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi=
=3Doff \
+-accel tcg \
+-cpu EPYC,monitor=3Don,x2apic=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=
=3Don,mpx=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,cmpccxadd=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3D=
on,3dnow=3Don,xsaveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,no-nested-data-bp=3Don,null-sel-clr-base=3Don,vme=3Doff,xsavec=3Doff=
,misalignsse=3Doff,osvw=3Doff,topoext=3Doff,fxsr-opt=3Doff,nrip-save=3Doff \
+-m size=3D219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
+-overcommit mem-lock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-boot strict=3Don \
+-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus=
":"pcie.0","multifunction":true,"addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus=
":"pcie.0","addr":"0x1.0x1"}' \
+-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu=
s":"pcie.0","addr":"0x1.0x2"}' \
+-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add=
r":"0x0"}' \
+-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-11.0.0.xml b/t=
ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-11.0.0.xml
new file mode 100644
index 0000000000..a02e8ed9bb
--- /dev/null
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-11.0.0.xml
@@ -0,0 +1,48 @@
+<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'q35'>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/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 4c9b55693a..9afedabae5 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -2224,6 +2224,8 @@ mymain(void)
     DO_TEST_CAPS_VER("cpu-host-model-kvm", "9.2.0");
     DO_TEST_CAPS_VER("cpu-host-model-kvm", "10.0.0");
     DO_TEST_CAPS_VER("cpu-host-model-kvm", "10.1.0");
+    DO_TEST_CAPS_VER("cpu-host-model-kvm", "10.2.0");
+    DO_TEST_CAPS_VER("cpu-host-model-kvm", "11.0.0");
=20
     DO_TEST_CAPS_VER("cpu-host-model-tcg", "6.2.0");
     DO_TEST_CAPS_VER("cpu-host-model-tcg", "7.0.0");
@@ -2237,6 +2239,8 @@ mymain(void)
     DO_TEST_CAPS_VER("cpu-host-model-tcg", "9.2.0");
     DO_TEST_CAPS_VER("cpu-host-model-tcg", "10.0.0");
     DO_TEST_CAPS_VER("cpu-host-model-tcg", "10.1.0");
+    DO_TEST_CAPS_VER("cpu-host-model-tcg", "10.2.0");
+    DO_TEST_CAPS_VER("cpu-host-model-tcg", "11.0.0");
=20
     DO_TEST_CAPS_VER("cpu-host-model-fallback-kvm", "6.2.0");
     DO_TEST_CAPS_VER("cpu-host-model-fallback-kvm", "7.0.0");
@@ -2250,6 +2254,8 @@ mymain(void)
     DO_TEST_CAPS_VER("cpu-host-model-fallback-kvm", "9.2.0");
     DO_TEST_CAPS_VER("cpu-host-model-fallback-kvm", "10.0.0");
     DO_TEST_CAPS_VER("cpu-host-model-fallback-kvm", "10.1.0");
+    DO_TEST_CAPS_VER("cpu-host-model-fallback-kvm", "10.2.0");
+    DO_TEST_CAPS_VER("cpu-host-model-fallback-kvm", "11.0.0");
=20
     DO_TEST_CAPS_VER("cpu-host-model-fallback-tcg", "6.2.0");
     DO_TEST_CAPS_VER("cpu-host-model-fallback-tcg", "7.0.0");
@@ -2263,6 +2269,8 @@ mymain(void)
     DO_TEST_CAPS_VER("cpu-host-model-fallback-tcg", "9.2.0");
     DO_TEST_CAPS_VER("cpu-host-model-fallback-tcg", "10.0.0");
     DO_TEST_CAPS_VER("cpu-host-model-fallback-tcg", "10.1.0");
+    DO_TEST_CAPS_VER("cpu-host-model-fallback-tcg", "10.2.0");
+    DO_TEST_CAPS_VER("cpu-host-model-fallback-tcg", "11.0.0");
=20
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-kvm", "6.2.0");
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-kvm", "7.0.0");
@@ -2276,6 +2284,8 @@ mymain(void)
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-kvm", "9.2.0");
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-kvm", "10.0.0");
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-kvm", "10.1.0");
+    DO_TEST_CAPS_VER("cpu-host-model-nofallback-kvm", "10.2.0");
+    DO_TEST_CAPS_VER("cpu-host-model-nofallback-kvm", "11.0.0");
=20
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-tcg", "6.2.0");
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-tcg", "7.0.0");
@@ -2289,6 +2299,8 @@ mymain(void)
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-tcg", "9.2.0");
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-tcg", "10.0.0");
     DO_TEST_CAPS_VER("cpu-host-model-nofallback-tcg", "10.1.0");
+    DO_TEST_CAPS_VER("cpu-host-model-nofallback-tcg", "10.2.0");
+    DO_TEST_CAPS_VER("cpu-host-model-nofallback-tcg", "11.0.0");
=20
     /* For this specific test we accept the increased likelihood of changes
      * if qemu updates the CPU model */
--=20
2.53.0