From 7ba1c414d64a8d43dc877487a56989a735854db9 Mon Sep 17 00:00:00 2001
Message-ID: <7ba1c414d64a8d43dc877487a56989a735854db9.1781277506.git.jdenemar@redhat.com>
From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 29 May 2026 14:19:30 +0200
Subject: [PATCH] qemu_capabilities: Always sort features in host-model CPU

Expanding a CPU model always produces a sorted list of features so the
features in host-model CPU capabilities were either sorted or not
depending on flags passed to virConnectGetDomainCapabilities.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
(cherry picked from commit 003b573108d8e0f09b6069d69fd31ca637afe21c)

https://redhat.atlassian.net/browse/RHEL-180449

Conflicts:
	tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml
	tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml
	tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml
	tests/domaincapsdata/qemu_10.2.0.x86_64.xml
            - different set of features

	tests/domaincapsdata/qemu_10.1.0.s390x.xml
	tests/domaincapsdata/qemu_11.0.0-q35.x86_64+sgx.xml
	tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml
	tests/domaincapsdata/qemu_11.0.0-tcg.x86_64+sgx.xml
	tests/domaincapsdata/qemu_11.0.0-tcg.x86_64.xml
	tests/domaincapsdata/qemu_11.0.0.s390x.xml
	tests/domaincapsdata/qemu_11.0.0.x86_64+sgx.xml
	tests/domaincapsdata/qemu_11.0.0.x86_64.xml
            - missing downstream

	tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
	tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
	tests/domaincapsdata/qemu_6.2.0.x86_64.xml
	tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
	tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
	tests/domaincapsdata/qemu_7.0.0.x86_64.xml
	tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
	tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
	tests/domaincapsdata/qemu_7.1.0.x86_64.xml
            - missing upstream

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/qemu/qemu_capabilities.c                  |  1 +
 .../qemu_10.0.0-q35.x86_64+amdsev.xml         | 48 +++++-----
 .../domaincapsdata/qemu_10.0.0-q35.x86_64.xml | 50 +++++-----
 .../qemu_10.0.0-tcg.x86_64+amdsev.xml         | 60 ++++++------
 .../domaincapsdata/qemu_10.0.0-tcg.x86_64.xml | 60 ++++++------
 tests/domaincapsdata/qemu_10.0.0.s390x.xml    | 94 +++++++++----------
 .../qemu_10.0.0.x86_64+amdsev.xml             | 48 +++++-----
 tests/domaincapsdata/qemu_10.0.0.x86_64.xml   | 50 +++++-----
 .../qemu_10.1.0-q35.x86_64+inteltdx.xml       | 52 +++++-----
 .../domaincapsdata/qemu_10.1.0-q35.x86_64.xml | 40 ++++----
 .../qemu_10.1.0-tcg.x86_64+inteltdx.xml       | 66 ++++++-------
 .../domaincapsdata/qemu_10.1.0-tcg.x86_64.xml | 66 ++++++-------
 .../qemu_10.1.0.x86_64+inteltdx.xml           | 52 +++++-----
 tests/domaincapsdata/qemu_10.1.0.x86_64.xml   | 40 ++++----
 .../domaincapsdata/qemu_10.2.0-q35.x86_64.xml | 24 ++---
 .../qemu_10.2.0-tcg.x86_64+mshv.xml           | 66 ++++++-------
 .../domaincapsdata/qemu_10.2.0-tcg.x86_64.xml | 66 ++++++-------
 tests/domaincapsdata/qemu_10.2.0.x86_64.xml   | 24 ++---
 .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml  | 28 +++---
 .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  | 64 ++++++-------
 tests/domaincapsdata/qemu_6.2.0.x86_64.xml    | 28 +++---
 .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  | 30 +++---
 .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml  | 66 ++++++-------
 tests/domaincapsdata/qemu_7.0.0.x86_64.xml    | 30 +++---
 .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml  | 32 +++----
 .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml  | 66 ++++++-------
 tests/domaincapsdata/qemu_7.1.0.x86_64.xml    | 32 +++----
 .../qemu_7.2.0-hvf.x86_64+hvf.xml             | 36 +++----
 .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml  | 36 +++----
 .../qemu_7.2.0-tcg.x86_64+hvf.xml             | 46 ++++-----
 .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml  | 46 ++++-----
 tests/domaincapsdata/qemu_7.2.0.x86_64.xml    | 36 +++----
 .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml  | 36 +++----
 .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml  | 54 +++++------
 tests/domaincapsdata/qemu_8.0.0.x86_64.xml    | 36 +++----
 .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml  | 38 ++++----
 .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml  | 60 ++++++------
 tests/domaincapsdata/qemu_8.1.0.s390x.xml     | 62 ++++++------
 tests/domaincapsdata/qemu_8.1.0.x86_64.xml    | 38 ++++----
 .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml  | 40 ++++----
 .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml  | 58 ++++++------
 tests/domaincapsdata/qemu_8.2.0.s390x.xml     | 62 ++++++------
 tests/domaincapsdata/qemu_8.2.0.x86_64.xml    | 40 ++++----
 .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml  | 40 ++++----
 .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml  | 62 ++++++------
 tests/domaincapsdata/qemu_9.0.0.x86_64.xml    | 40 ++++----
 .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml  | 48 +++++-----
 .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml  | 60 ++++++------
 tests/domaincapsdata/qemu_9.1.0.s390x.xml     | 94 +++++++++----------
 tests/domaincapsdata/qemu_9.1.0.x86_64.xml    | 48 +++++-----
 .../qemu_9.2.0-q35.x86_64+amdsev.xml          | 48 +++++-----
 .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml  | 50 +++++-----
 .../qemu_9.2.0-tcg.x86_64+amdsev.xml          | 60 ++++++------
 .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml  | 60 ++++++------
 tests/domaincapsdata/qemu_9.2.0.s390x.xml     | 94 +++++++++----------
 .../qemu_9.2.0.x86_64+amdsev.xml              | 48 +++++-----
 tests/domaincapsdata/qemu_9.2.0.x86_64.xml    | 50 +++++-----
 57 files changed, 1405 insertions(+), 1404 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 34c3fd991b..3c566132ba 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -6646,6 +6646,7 @@ virQEMUCapsFillDomainCPUHostModel(virQEMUCaps *qemuCaps,
     if (flags & VIR_CONNECT_GET_DOMAIN_CAPABILITIES_EXPAND_CPU_FEATURES)
         virCPUExpandFeatures(domCaps->arch, cpu);
 
+    virCPUDefSortFeatures(cpu);
     domCaps->cpu.hostModel = cpu;
 }
 
diff --git a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml
index bf6393dc03..b45822772c 100644
--- a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml
+++ b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml
@@ -55,37 +55,37 @@
       <model fallback='forbid'>EPYC-Genoa</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='spec-ctrl'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='flush-l1d'/>
       <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
       <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='overflow-recov'/>
-      <feature policy='require' name='succor'/>
-      <feature policy='require' name='invtsc'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='flush-l1d'/>
       <feature policy='require' name='flushbyasid'/>
+      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='ibpb-brtype'/>
+      <feature policy='require' name='invtsc'/>
+      <feature policy='require' name='lbrv'/>
+      <feature policy='require' name='mds-no'/>
+      <feature policy='require' name='overflow-recov'/>
       <feature policy='require' name='pause-filter'/>
+      <feature policy='require' name='perfmon-v2'/>
       <feature policy='require' name='pfthreshold'/>
+      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='rdctl-no'/>
+      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='sbpb'/>
+      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='spec-ctrl'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='succor'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
       <feature policy='require' name='v-vmsave-vmload'/>
       <feature policy='require' name='vgif'/>
-      <feature policy='require' name='sbpb'/>
-      <feature policy='require' name='ibpb-brtype'/>
-      <feature policy='require' name='perfmon-v2'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='gds-no'/>
-      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
index d6f710e56e..f05a0de35c 100644
--- a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
@@ -55,37 +55,37 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='overflow-recov'/>
-      <feature policy='require' name='succor'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
       <feature policy='require' name='flushbyasid'/>
+      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='ibpb-brtype'/>
+      <feature policy='require' name='invtsc'/>
+      <feature policy='require' name='lbrv'/>
+      <feature policy='require' name='lfence-always-serializing'/>
+      <feature policy='require' name='mds-no'/>
+      <feature policy='require' name='null-sel-clr-base'/>
+      <feature policy='require' name='overflow-recov'/>
       <feature policy='require' name='pause-filter'/>
       <feature policy='require' name='pfthreshold'/>
+      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='rdctl-no'/>
+      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='succor'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
       <feature policy='require' name='v-vmsave-vmload'/>
       <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='lfence-always-serializing'/>
-      <feature policy='require' name='null-sel-clr-base'/>
-      <feature policy='require' name='ibpb-brtype'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='gds-no'/>
-      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
diff --git a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml
index fb031b916e..f83f240cdb 100644
--- a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml
+++ b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml
@@ -46,39 +46,39 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='vaes'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='rdpid'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='fsrm'/>
-      <feature policy='require' name='cmpccxadd'/>
-      <feature policy='require' name='fzrm'/>
-      <feature policy='require' name='fsrs'/>
-      <feature policy='require' name='fsrc'/>
-      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='xsaveerptr'/>
-      <feature policy='require' name='wbnoinvd'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='disable' name='vme'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='osvw'/>
-      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='3dnowext'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='clwb'/>
+      <feature policy='require' name='cmpccxadd'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='require' name='fsrc'/>
+      <feature policy='require' name='fsrm'/>
+      <feature policy='require' name='fsrs'/>
       <feature policy='disable' name='fxsr_opt'/>
+      <feature policy='require' name='fzrm'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
+      <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='mpx'/>
+      <feature policy='require' name='npt'/>
       <feature policy='disable' name='nrip-save'/>
+      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
+      <feature policy='require' name='rdpid'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='umip'/>
+      <feature policy='require' name='vaes'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='disable' name='vme'/>
+      <feature policy='require' name='wbnoinvd'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='disable' name='xsavec'/>
+      <feature policy='require' name='xsaveerptr'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
index 8a5348d2a8..63e96f9a92 100644
--- a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
@@ -46,39 +46,39 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='vaes'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='rdpid'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='fsrm'/>
-      <feature policy='require' name='cmpccxadd'/>
-      <feature policy='require' name='fzrm'/>
-      <feature policy='require' name='fsrs'/>
-      <feature policy='require' name='fsrc'/>
-      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='xsaveerptr'/>
-      <feature policy='require' name='wbnoinvd'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='disable' name='vme'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='osvw'/>
-      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='3dnowext'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='clwb'/>
+      <feature policy='require' name='cmpccxadd'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='require' name='fsrc'/>
+      <feature policy='require' name='fsrm'/>
+      <feature policy='require' name='fsrs'/>
       <feature policy='disable' name='fxsr_opt'/>
+      <feature policy='require' name='fzrm'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
+      <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='mpx'/>
+      <feature policy='require' name='npt'/>
       <feature policy='disable' name='nrip-save'/>
+      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
+      <feature policy='require' name='rdpid'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='umip'/>
+      <feature policy='require' name='vaes'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='disable' name='vme'/>
+      <feature policy='require' name='wbnoinvd'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='disable' name='xsavec'/>
+      <feature policy='require' name='xsaveerptr'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_10.0.0.s390x.xml b/tests/domaincapsdata/qemu_10.0.0.s390x.xml
index ca741192ba..1b4551aaed 100644
--- a/tests/domaincapsdata/qemu_10.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_10.0.0.s390x.xml
@@ -42,61 +42,61 @@
     </mode>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>gen16a-base</model>
-      <feature policy='require' name='nnpa'/>
-      <feature policy='require' name='aen'/>
-      <feature policy='require' name='cmmnt'/>
-      <feature policy='require' name='vxpdeh'/>
       <feature policy='require' name='aefsi'/>
-      <feature policy='require' name='diag318'/>
-      <feature policy='require' name='csske'/>
-      <feature policy='require' name='mepoch'/>
-      <feature policy='require' name='msa9'/>
-      <feature policy='require' name='msa8'/>
-      <feature policy='require' name='msa7'/>
-      <feature policy='require' name='msa6'/>
-      <feature policy='require' name='msa5'/>
-      <feature policy='require' name='msa4'/>
-      <feature policy='require' name='msa3'/>
-      <feature policy='require' name='msa2'/>
-      <feature policy='require' name='msa1'/>
-      <feature policy='require' name='sthyi'/>
-      <feature policy='require' name='edat'/>
-      <feature policy='require' name='ri'/>
-      <feature policy='require' name='deflate'/>
-      <feature policy='require' name='edat2'/>
-      <feature policy='require' name='etoken'/>
-      <feature policy='require' name='vx'/>
-      <feature policy='require' name='ipter'/>
-      <feature policy='require' name='pai'/>
-      <feature policy='require' name='paie'/>
-      <feature policy='require' name='mepochptff'/>
+      <feature policy='require' name='aen'/>
+      <feature policy='require' name='ais'/>
       <feature policy='require' name='ap'/>
-      <feature policy='require' name='vxeh'/>
-      <feature policy='require' name='vxpd'/>
-      <feature policy='require' name='esop'/>
-      <feature policy='require' name='msa9_pckmo'/>
-      <feature policy='require' name='vxeh2'/>
-      <feature policy='require' name='esort'/>
-      <feature policy='require' name='appv'/>
-      <feature policy='require' name='apqi'/>
       <feature policy='require' name='apft'/>
-      <feature policy='require' name='els'/>
-      <feature policy='require' name='iep'/>
+      <feature policy='require' name='appv'/>
       <feature policy='require' name='appvi'/>
       <feature policy='require' name='apqci'/>
-      <feature policy='require' name='cte'/>
-      <feature policy='require' name='ais'/>
-      <feature policy='require' name='bpb'/>
-      <feature policy='require' name='ctop'/>
-      <feature policy='require' name='gs'/>
-      <feature policy='require' name='ppa15'/>
-      <feature policy='require' name='zpci'/>
-      <feature policy='require' name='rdp'/>
-      <feature policy='require' name='sea_esop2'/>
+      <feature policy='require' name='apqi'/>
       <feature policy='require' name='beareh'/>
-      <feature policy='require' name='te'/>
+      <feature policy='require' name='bpb'/>
       <feature policy='require' name='cmm'/>
+      <feature policy='require' name='cmmnt'/>
+      <feature policy='require' name='csske'/>
+      <feature policy='require' name='cte'/>
+      <feature policy='require' name='ctop'/>
+      <feature policy='require' name='deflate'/>
+      <feature policy='require' name='diag318'/>
+      <feature policy='require' name='edat'/>
+      <feature policy='require' name='edat2'/>
+      <feature policy='require' name='els'/>
+      <feature policy='require' name='esop'/>
+      <feature policy='require' name='esort'/>
+      <feature policy='require' name='etoken'/>
+      <feature policy='require' name='gs'/>
+      <feature policy='require' name='iep'/>
+      <feature policy='require' name='ipter'/>
+      <feature policy='require' name='mepoch'/>
+      <feature policy='require' name='mepochptff'/>
+      <feature policy='require' name='msa1'/>
+      <feature policy='require' name='msa2'/>
+      <feature policy='require' name='msa3'/>
+      <feature policy='require' name='msa4'/>
+      <feature policy='require' name='msa5'/>
+      <feature policy='require' name='msa6'/>
+      <feature policy='require' name='msa7'/>
+      <feature policy='require' name='msa8'/>
+      <feature policy='require' name='msa9'/>
+      <feature policy='require' name='msa9_pckmo'/>
+      <feature policy='require' name='nnpa'/>
+      <feature policy='require' name='pai'/>
+      <feature policy='require' name='paie'/>
+      <feature policy='require' name='ppa15'/>
+      <feature policy='require' name='rdp'/>
+      <feature policy='require' name='ri'/>
+      <feature policy='require' name='sea_esop2'/>
+      <feature policy='require' name='sthyi'/>
+      <feature policy='require' name='te'/>
+      <feature policy='require' name='vx'/>
+      <feature policy='require' name='vxeh'/>
+      <feature policy='require' name='vxeh2'/>
+      <feature policy='require' name='vxpd'/>
+      <feature policy='require' name='vxpdeh'/>
       <feature policy='require' name='vxpdeh2'/>
+      <feature policy='require' name='zpci'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='IBM'>gen15a</model>
diff --git a/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml
index 6a4ea003f7..e32c3529fc 100644
--- a/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml
+++ b/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml
@@ -52,37 +52,37 @@
       <model fallback='forbid'>EPYC-Genoa</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='spec-ctrl'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='flush-l1d'/>
       <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
       <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='overflow-recov'/>
-      <feature policy='require' name='succor'/>
-      <feature policy='require' name='invtsc'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='flush-l1d'/>
       <feature policy='require' name='flushbyasid'/>
+      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='ibpb-brtype'/>
+      <feature policy='require' name='invtsc'/>
+      <feature policy='require' name='lbrv'/>
+      <feature policy='require' name='mds-no'/>
+      <feature policy='require' name='overflow-recov'/>
       <feature policy='require' name='pause-filter'/>
+      <feature policy='require' name='perfmon-v2'/>
       <feature policy='require' name='pfthreshold'/>
+      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='rdctl-no'/>
+      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='sbpb'/>
+      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='spec-ctrl'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='succor'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
       <feature policy='require' name='v-vmsave-vmload'/>
       <feature policy='require' name='vgif'/>
-      <feature policy='require' name='sbpb'/>
-      <feature policy='require' name='ibpb-brtype'/>
-      <feature policy='require' name='perfmon-v2'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='gds-no'/>
-      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_10.0.0.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0.x86_64.xml
index f12dd845ba..13a51160ea 100644
--- a/tests/domaincapsdata/qemu_10.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.0.0.x86_64.xml
@@ -52,37 +52,37 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='overflow-recov'/>
-      <feature policy='require' name='succor'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
       <feature policy='require' name='flushbyasid'/>
+      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='ibpb-brtype'/>
+      <feature policy='require' name='invtsc'/>
+      <feature policy='require' name='lbrv'/>
+      <feature policy='require' name='lfence-always-serializing'/>
+      <feature policy='require' name='mds-no'/>
+      <feature policy='require' name='null-sel-clr-base'/>
+      <feature policy='require' name='overflow-recov'/>
       <feature policy='require' name='pause-filter'/>
       <feature policy='require' name='pfthreshold'/>
+      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='rdctl-no'/>
+      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='succor'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
       <feature policy='require' name='v-vmsave-vmload'/>
       <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='lfence-always-serializing'/>
-      <feature policy='require' name='null-sel-clr-base'/>
-      <feature policy='require' name='ibpb-brtype'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='gds-no'/>
-      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
diff --git a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml
index 4632a816f5..8bcf249b54 100644
--- a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml
+++ b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml
@@ -55,40 +55,40 @@
       <model fallback='forbid'>GraniteRapids</model>
       <vendor>Intel</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='dtes64'/>
-      <feature policy='require' name='vmx'/>
-      <feature policy='require' name='pdcm'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='ds'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='fdp-excptn-only'/>
-      <feature policy='require' name='zero-fcs-fds'/>
-      <feature policy='require' name='waitpkg'/>
+      <feature policy='require' name='amd-ssbd'/>
+      <feature policy='require' name='amd-stibp'/>
       <feature policy='require' name='cldemote'/>
-      <feature policy='require' name='movdiri'/>
-      <feature policy='require' name='movdir64b'/>
-      <feature policy='require' name='md-clear'/>
-      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='ds'/>
+      <feature policy='require' name='dtes64'/>
+      <feature policy='disable' name='fbsdp-no'/>
+      <feature policy='require' name='fdp-excptn-only'/>
       <feature policy='require' name='flush-l1d'/>
-      <feature policy='require' name='intel-psfd'/>
-      <feature policy='require' name='invtsc'/>
+      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='ibpb'/>
       <feature policy='require' name='ibrs'/>
-      <feature policy='require' name='amd-stibp'/>
-      <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='tsx-ctrl'/>
-      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='intel-psfd'/>
+      <feature policy='require' name='invtsc'/>
+      <feature policy='disable' name='mcdt-no'/>
+      <feature policy='require' name='md-clear'/>
+      <feature policy='require' name='movdir64b'/>
+      <feature policy='require' name='movdiri'/>
+      <feature policy='disable' name='pbrsb-no'/>
+      <feature policy='require' name='pdcm'/>
+      <feature policy='disable' name='psdp-no'/>
       <feature policy='require' name='rfds-no'/>
+      <feature policy='disable' name='sbdr-ssdp-no'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='tsx-ctrl'/>
+      <feature policy='require' name='vmx'/>
       <feature policy='require' name='vmx-activity-wait-sipi'/>
+      <feature policy='require' name='vmx-enable-user-wait-pause'/>
       <feature policy='require' name='vmx-encls-exit'/>
       <feature policy='require' name='vmx-tsc-scaling'/>
-      <feature policy='require' name='vmx-enable-user-wait-pause'/>
-      <feature policy='disable' name='mcdt-no'/>
-      <feature policy='disable' name='sbdr-ssdp-no'/>
-      <feature policy='disable' name='fbsdp-no'/>
-      <feature policy='disable' name='psdp-no'/>
-      <feature policy='disable' name='pbrsb-no'/>
+      <feature policy='require' name='waitpkg'/>
+      <feature policy='require' name='zero-fcs-fds'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml
index 60cc9eee3d..07da5ddaca 100644
--- a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml
@@ -55,30 +55,30 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='overflow-recov'/>
-      <feature policy='require' name='succor'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='cmp_legacy'/>
       <feature policy='require' name='flushbyasid'/>
-      <feature policy='require' name='pause-filter'/>
-      <feature policy='require' name='pfthreshold'/>
-      <feature policy='require' name='v-vmsave-vmload'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='ibpb-brtype'/>
+      <feature policy='require' name='invtsc'/>
+      <feature policy='require' name='lbrv'/>
       <feature policy='require' name='lfence-always-serializing'/>
       <feature policy='require' name='null-sel-clr-base'/>
-      <feature policy='require' name='ibpb-brtype'/>
+      <feature policy='require' name='overflow-recov'/>
+      <feature policy='require' name='pause-filter'/>
+      <feature policy='require' name='pfthreshold'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='succor'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='v-vmsave-vmload'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
diff --git a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml
index ae6a2064d1..78a7a960c9 100644
--- a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml
+++ b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml
@@ -46,42 +46,42 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='vaes'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='rdpid'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='fsrm'/>
-      <feature policy='require' name='cmpccxadd'/>
-      <feature policy='require' name='fzrm'/>
-      <feature policy='require' name='fsrs'/>
-      <feature policy='require' name='fsrc'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='xsaveerptr'/>
-      <feature policy='require' name='wbnoinvd'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='no-nested-data-bp'/>
-      <feature policy='require' name='null-sel-clr-base'/>
-      <feature policy='disable' name='vme'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='osvw'/>
-      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='3dnowext'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='clwb'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='cmpccxadd'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='require' name='fsrc'/>
+      <feature policy='require' name='fsrm'/>
+      <feature policy='require' name='fsrs'/>
       <feature policy='disable' name='fxsr_opt'/>
+      <feature policy='require' name='fzrm'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
+      <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='mpx'/>
+      <feature policy='require' name='no-nested-data-bp'/>
+      <feature policy='require' name='npt'/>
       <feature policy='disable' name='nrip-save'/>
+      <feature policy='require' name='null-sel-clr-base'/>
+      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
+      <feature policy='require' name='rdpid'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='umip'/>
+      <feature policy='require' name='vaes'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='disable' name='vme'/>
+      <feature policy='require' name='wbnoinvd'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='disable' name='xsavec'/>
+      <feature policy='require' name='xsaveerptr'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml
index b3c7bc60b5..229246112e 100644
--- a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml
@@ -46,42 +46,42 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='vaes'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='rdpid'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='fsrm'/>
-      <feature policy='require' name='cmpccxadd'/>
-      <feature policy='require' name='fzrm'/>
-      <feature policy='require' name='fsrs'/>
-      <feature policy='require' name='fsrc'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='xsaveerptr'/>
-      <feature policy='require' name='wbnoinvd'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='no-nested-data-bp'/>
-      <feature policy='require' name='null-sel-clr-base'/>
-      <feature policy='disable' name='vme'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='osvw'/>
-      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='3dnowext'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='clwb'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='cmpccxadd'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='require' name='fsrc'/>
+      <feature policy='require' name='fsrm'/>
+      <feature policy='require' name='fsrs'/>
       <feature policy='disable' name='fxsr_opt'/>
+      <feature policy='require' name='fzrm'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
+      <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='mpx'/>
+      <feature policy='require' name='no-nested-data-bp'/>
+      <feature policy='require' name='npt'/>
       <feature policy='disable' name='nrip-save'/>
+      <feature policy='require' name='null-sel-clr-base'/>
+      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
+      <feature policy='require' name='rdpid'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='umip'/>
+      <feature policy='require' name='vaes'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='disable' name='vme'/>
+      <feature policy='require' name='wbnoinvd'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='disable' name='xsavec'/>
+      <feature policy='require' name='xsaveerptr'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml
index 4cfbc814be..4ab59644f1 100644
--- a/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml
+++ b/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml
@@ -52,40 +52,40 @@
       <model fallback='forbid'>GraniteRapids</model>
       <vendor>Intel</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='dtes64'/>
-      <feature policy='require' name='vmx'/>
-      <feature policy='require' name='pdcm'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='ds'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='fdp-excptn-only'/>
-      <feature policy='require' name='zero-fcs-fds'/>
-      <feature policy='require' name='waitpkg'/>
+      <feature policy='require' name='amd-ssbd'/>
+      <feature policy='require' name='amd-stibp'/>
       <feature policy='require' name='cldemote'/>
-      <feature policy='require' name='movdiri'/>
-      <feature policy='require' name='movdir64b'/>
-      <feature policy='require' name='md-clear'/>
-      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='ds'/>
+      <feature policy='require' name='dtes64'/>
+      <feature policy='disable' name='fbsdp-no'/>
+      <feature policy='require' name='fdp-excptn-only'/>
       <feature policy='require' name='flush-l1d'/>
-      <feature policy='require' name='intel-psfd'/>
-      <feature policy='require' name='invtsc'/>
+      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='ibpb'/>
       <feature policy='require' name='ibrs'/>
-      <feature policy='require' name='amd-stibp'/>
-      <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='tsx-ctrl'/>
-      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='intel-psfd'/>
+      <feature policy='require' name='invtsc'/>
+      <feature policy='disable' name='mcdt-no'/>
+      <feature policy='require' name='md-clear'/>
+      <feature policy='require' name='movdir64b'/>
+      <feature policy='require' name='movdiri'/>
+      <feature policy='disable' name='pbrsb-no'/>
+      <feature policy='require' name='pdcm'/>
+      <feature policy='disable' name='psdp-no'/>
       <feature policy='require' name='rfds-no'/>
+      <feature policy='disable' name='sbdr-ssdp-no'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='tsx-ctrl'/>
+      <feature policy='require' name='vmx'/>
       <feature policy='require' name='vmx-activity-wait-sipi'/>
+      <feature policy='require' name='vmx-enable-user-wait-pause'/>
       <feature policy='require' name='vmx-encls-exit'/>
       <feature policy='require' name='vmx-tsc-scaling'/>
-      <feature policy='require' name='vmx-enable-user-wait-pause'/>
-      <feature policy='disable' name='mcdt-no'/>
-      <feature policy='disable' name='sbdr-ssdp-no'/>
-      <feature policy='disable' name='fbsdp-no'/>
-      <feature policy='disable' name='psdp-no'/>
-      <feature policy='disable' name='pbrsb-no'/>
+      <feature policy='require' name='waitpkg'/>
+      <feature policy='require' name='zero-fcs-fds'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_10.1.0.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0.x86_64.xml
index 9cb65712a4..63d0523b82 100644
--- a/tests/domaincapsdata/qemu_10.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.1.0.x86_64.xml
@@ -52,30 +52,30 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='overflow-recov'/>
-      <feature policy='require' name='succor'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='cmp_legacy'/>
       <feature policy='require' name='flushbyasid'/>
-      <feature policy='require' name='pause-filter'/>
-      <feature policy='require' name='pfthreshold'/>
-      <feature policy='require' name='v-vmsave-vmload'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='ibpb-brtype'/>
+      <feature policy='require' name='invtsc'/>
+      <feature policy='require' name='lbrv'/>
       <feature policy='require' name='lfence-always-serializing'/>
       <feature policy='require' name='null-sel-clr-base'/>
-      <feature policy='require' name='ibpb-brtype'/>
+      <feature policy='require' name='overflow-recov'/>
+      <feature policy='require' name='pause-filter'/>
+      <feature policy='require' name='pfthreshold'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='succor'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='v-vmsave-vmload'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
diff --git a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml
index 640e9e8f87..95fbe9896e 100644
--- a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml
@@ -55,21 +55,21 @@
       <model fallback='forbid'>EPYC-Turin</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='spec-ctrl'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='flush-l1d'/>
-      <feature policy='require' name='ssbd'/>
       <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='flush-l1d'/>
+      <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='invtsc'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='tsa-sq-no'/>
-      <feature policy='require' name='tsa-l1-no'/>
-      <feature policy='disable' name='pcid'/>
       <feature policy='disable' name='la57'/>
+      <feature policy='disable' name='pcid'/>
+      <feature policy='require' name='spec-ctrl'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='tsa-l1-no'/>
+      <feature policy='require' name='tsa-sq-no'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='x2apic'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64+mshv.xml b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64+mshv.xml
index 771ef3a0f6..5d588a6639 100644
--- a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64+mshv.xml
+++ b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64+mshv.xml
@@ -46,42 +46,42 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='vaes'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='rdpid'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='fsrm'/>
-      <feature policy='require' name='cmpccxadd'/>
-      <feature policy='require' name='fzrm'/>
-      <feature policy='require' name='fsrs'/>
-      <feature policy='require' name='fsrc'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='xsaveerptr'/>
-      <feature policy='require' name='wbnoinvd'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='no-nested-data-bp'/>
-      <feature policy='require' name='null-sel-clr-base'/>
-      <feature policy='disable' name='vme'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='osvw'/>
-      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='3dnowext'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='clwb'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='cmpccxadd'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='require' name='fsrc'/>
+      <feature policy='require' name='fsrm'/>
+      <feature policy='require' name='fsrs'/>
       <feature policy='disable' name='fxsr_opt'/>
+      <feature policy='require' name='fzrm'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
+      <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='mpx'/>
+      <feature policy='require' name='no-nested-data-bp'/>
+      <feature policy='require' name='npt'/>
       <feature policy='disable' name='nrip-save'/>
+      <feature policy='require' name='null-sel-clr-base'/>
+      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
+      <feature policy='require' name='rdpid'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='umip'/>
+      <feature policy='require' name='vaes'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='disable' name='vme'/>
+      <feature policy='require' name='wbnoinvd'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='disable' name='xsavec'/>
+      <feature policy='require' name='xsaveerptr'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml
index f0e08907ff..8537512823 100644
--- a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml
@@ -46,42 +46,42 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='vaes'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='rdpid'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='fsrm'/>
-      <feature policy='require' name='cmpccxadd'/>
-      <feature policy='require' name='fzrm'/>
-      <feature policy='require' name='fsrs'/>
-      <feature policy='require' name='fsrc'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='xsaveerptr'/>
-      <feature policy='require' name='wbnoinvd'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='no-nested-data-bp'/>
-      <feature policy='require' name='null-sel-clr-base'/>
-      <feature policy='disable' name='vme'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='osvw'/>
-      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='3dnowext'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='clwb'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='cmpccxadd'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='require' name='fsrc'/>
+      <feature policy='require' name='fsrm'/>
+      <feature policy='require' name='fsrs'/>
       <feature policy='disable' name='fxsr_opt'/>
+      <feature policy='require' name='fzrm'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
+      <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='mpx'/>
+      <feature policy='require' name='no-nested-data-bp'/>
+      <feature policy='require' name='npt'/>
       <feature policy='disable' name='nrip-save'/>
+      <feature policy='require' name='null-sel-clr-base'/>
+      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
+      <feature policy='require' name='rdpid'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='umip'/>
+      <feature policy='require' name='vaes'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='disable' name='vme'/>
+      <feature policy='require' name='wbnoinvd'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='disable' name='xsavec'/>
+      <feature policy='require' name='xsaveerptr'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_10.2.0.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0.x86_64.xml
index 97bdd83260..bb7f4a4e20 100644
--- a/tests/domaincapsdata/qemu_10.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.2.0.x86_64.xml
@@ -52,21 +52,21 @@
       <model fallback='forbid'>EPYC-Turin</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='spec-ctrl'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='flush-l1d'/>
-      <feature policy='require' name='ssbd'/>
       <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='flush-l1d'/>
+      <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='invtsc'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='tsa-sq-no'/>
-      <feature policy='require' name='tsa-l1-no'/>
-      <feature policy='disable' name='pcid'/>
       <feature policy='disable' name='la57'/>
+      <feature policy='disable' name='pcid'/>
+      <feature policy='require' name='spec-ctrl'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='tsa-l1-no'/>
+      <feature policy='require' name='tsa-sq-no'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='x2apic'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
index 96dcc32019..67ba6d8cc6 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -55,23 +55,23 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='mds-no'/>
       <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='rdctl-no'/>
+      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='require' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
index a92050ad5b..4ea8052da3 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -46,44 +46,44 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='pclmuldq'/>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='ssse3'/>
-      <feature policy='require' name='sse4.1'/>
-      <feature policy='require' name='sse4.2'/>
-      <feature policy='require' name='movbe'/>
-      <feature policy='require' name='aes'/>
-      <feature policy='require' name='xsave'/>
-      <feature policy='require' name='rdrand'/>
-      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='3dnow'/>
+      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='arat'/>
-      <feature policy='require' name='fsgsbase'/>
-      <feature policy='require' name='bmi1'/>
-      <feature policy='require' name='smep'/>
-      <feature policy='require' name='bmi2'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
       <feature policy='require' name='adx'/>
-      <feature policy='require' name='smap'/>
-      <feature policy='require' name='pcommit'/>
+      <feature policy='require' name='aes'/>
+      <feature policy='require' name='arat'/>
+      <feature policy='require' name='bmi1'/>
+      <feature policy='require' name='bmi2'/>
       <feature policy='require' name='clflushopt'/>
       <feature policy='require' name='clwb'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='xsaveopt'/>
-      <feature policy='require' name='xgetbv1'/>
       <feature policy='require' name='cr8legacy'/>
-      <feature policy='require' name='mmxext'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='3dnowext'/>
-      <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='require' name='fsgsbase'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
       <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='mmxext'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='movbe'/>
+      <feature policy='require' name='mpx'/>
+      <feature policy='require' name='npt'/>
+      <feature policy='require' name='pclmuldq'/>
+      <feature policy='require' name='pcommit'/>
+      <feature policy='require' name='pdpe1gb'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
+      <feature policy='require' name='rdrand'/>
+      <feature policy='require' name='smap'/>
+      <feature policy='require' name='smep'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='sse4.1'/>
+      <feature policy='require' name='sse4.2'/>
+      <feature policy='require' name='ssse3'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='require' name='xgetbv1'/>
+      <feature policy='require' name='xsave'/>
+      <feature policy='require' name='xsaveopt'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index eb347adce9..e0df5fd10f 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -52,23 +52,23 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='mds-no'/>
       <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='rdctl-no'/>
+      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='require' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
index 0c3d00865e..c8bd0139d1 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -55,24 +55,24 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='mds-no'/>
       <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='rdctl-no'/>
+      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='require' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
index 6b5dff857b..4fa9e1f727 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -46,45 +46,45 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='pclmuldq'/>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='ssse3'/>
-      <feature policy='require' name='sse4.1'/>
-      <feature policy='require' name='sse4.2'/>
-      <feature policy='require' name='movbe'/>
-      <feature policy='require' name='aes'/>
-      <feature policy='require' name='xsave'/>
-      <feature policy='require' name='rdrand'/>
-      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='3dnow'/>
+      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='arat'/>
-      <feature policy='require' name='fsgsbase'/>
-      <feature policy='require' name='bmi1'/>
-      <feature policy='require' name='smep'/>
-      <feature policy='require' name='bmi2'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
       <feature policy='require' name='adx'/>
-      <feature policy='require' name='smap'/>
-      <feature policy='require' name='pcommit'/>
+      <feature policy='require' name='aes'/>
+      <feature policy='require' name='arat'/>
+      <feature policy='require' name='bmi1'/>
+      <feature policy='require' name='bmi2'/>
       <feature policy='require' name='clflushopt'/>
       <feature policy='require' name='clwb'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='xsaveopt'/>
-      <feature policy='require' name='xgetbv1'/>
       <feature policy='require' name='cr8legacy'/>
-      <feature policy='require' name='mmxext'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='3dnowext'/>
-      <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='require' name='fsgsbase'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
       <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='mmxext'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='movbe'/>
+      <feature policy='require' name='mpx'/>
+      <feature policy='require' name='npt'/>
+      <feature policy='require' name='pclmuldq'/>
+      <feature policy='require' name='pcommit'/>
+      <feature policy='require' name='pdpe1gb'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
+      <feature policy='require' name='rdrand'/>
+      <feature policy='require' name='smap'/>
+      <feature policy='require' name='smep'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='sse4.1'/>
+      <feature policy='require' name='sse4.2'/>
+      <feature policy='require' name='ssse3'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='umip'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='require' name='xgetbv1'/>
+      <feature policy='require' name='xsave'/>
+      <feature policy='require' name='xsaveopt'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index c568ae3d80..1a5aa7756c 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -52,24 +52,24 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='mds-no'/>
       <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='rdctl-no'/>
+      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='require' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 5e13f1f7fb..0acada1f0f 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -55,25 +55,25 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='mds-no'/>
       <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='rdctl-no'/>
+      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='require' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
index f9114422bd..424b06fba9 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -46,45 +46,45 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='pclmuldq'/>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='ssse3'/>
-      <feature policy='require' name='sse4.1'/>
-      <feature policy='require' name='sse4.2'/>
-      <feature policy='require' name='movbe'/>
-      <feature policy='require' name='aes'/>
-      <feature policy='require' name='xsave'/>
-      <feature policy='require' name='rdrand'/>
-      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='3dnow'/>
+      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='arat'/>
-      <feature policy='require' name='fsgsbase'/>
-      <feature policy='require' name='bmi1'/>
-      <feature policy='require' name='smep'/>
-      <feature policy='require' name='bmi2'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
       <feature policy='require' name='adx'/>
-      <feature policy='require' name='smap'/>
-      <feature policy='require' name='pcommit'/>
+      <feature policy='require' name='aes'/>
+      <feature policy='require' name='arat'/>
+      <feature policy='require' name='bmi1'/>
+      <feature policy='require' name='bmi2'/>
       <feature policy='require' name='clflushopt'/>
       <feature policy='require' name='clwb'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='xsaveopt'/>
-      <feature policy='require' name='xgetbv1'/>
       <feature policy='require' name='cr8legacy'/>
-      <feature policy='require' name='mmxext'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='3dnowext'/>
-      <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='require' name='fsgsbase'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
       <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='mmxext'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='movbe'/>
+      <feature policy='require' name='mpx'/>
+      <feature policy='require' name='npt'/>
+      <feature policy='require' name='pclmuldq'/>
+      <feature policy='require' name='pcommit'/>
+      <feature policy='require' name='pdpe1gb'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
+      <feature policy='require' name='rdrand'/>
+      <feature policy='require' name='smap'/>
+      <feature policy='require' name='smep'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='sse4.1'/>
+      <feature policy='require' name='sse4.2'/>
+      <feature policy='require' name='ssse3'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='umip'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='require' name='xgetbv1'/>
+      <feature policy='require' name='xsave'/>
+      <feature policy='require' name='xsaveopt'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index f574894ad0..0b0f504cb7 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -52,25 +52,25 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='mds-no'/>
       <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='rdctl-no'/>
+      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='require' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml
index 1fdde871f8..da77b9d5d7 100644
--- a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml
@@ -52,30 +52,30 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='mds-no'/>
       <feature policy='require' name='pause-filter'/>
       <feature policy='require' name='pfthreshold'/>
-      <feature policy='require' name='v-vmsave-vmload'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='pschange-mc-no'/>
       <feature policy='require' name='rdctl-no'/>
       <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='v-vmsave-vmload'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='require' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
index b4c4153953..8b730b11c9 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -55,30 +55,30 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='mds-no'/>
       <feature policy='require' name='pause-filter'/>
       <feature policy='require' name='pfthreshold'/>
-      <feature policy='require' name='v-vmsave-vmload'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='pschange-mc-no'/>
       <feature policy='require' name='rdctl-no'/>
       <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='v-vmsave-vmload'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='require' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index 989c3e274c..e3a9ff55fa 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
@@ -46,34 +46,34 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='pcommit'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='vaes'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
+      <feature policy='require' name='3dnowext'/>
+      <feature policy='disable' name='3dnowprefetch'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='clwb'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='disable' name='fxsr_opt'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
+      <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='mpx'/>
       <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='disable' name='vme'/>
+      <feature policy='disable' name='nrip-save'/>
+      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='pcommit'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
       <feature policy='disable' name='rdseed'/>
       <feature policy='disable' name='sha-ni'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='3dnowprefetch'/>
-      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='svme-addr-chk'/>
       <feature policy='disable' name='topoext'/>
-      <feature policy='disable' name='fxsr_opt'/>
-      <feature policy='disable' name='nrip-save'/>
+      <feature policy='require' name='umip'/>
+      <feature policy='require' name='vaes'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='disable' name='vme'/>
+      <feature policy='disable' name='xsavec'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
index 989c3e274c..e3a9ff55fa 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -46,34 +46,34 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='pcommit'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='vaes'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
+      <feature policy='require' name='3dnowext'/>
+      <feature policy='disable' name='3dnowprefetch'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='clwb'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='disable' name='fxsr_opt'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
+      <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='mpx'/>
       <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='disable' name='vme'/>
+      <feature policy='disable' name='nrip-save'/>
+      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='pcommit'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
       <feature policy='disable' name='rdseed'/>
       <feature policy='disable' name='sha-ni'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='3dnowprefetch'/>
-      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='svme-addr-chk'/>
       <feature policy='disable' name='topoext'/>
-      <feature policy='disable' name='fxsr_opt'/>
-      <feature policy='disable' name='nrip-save'/>
+      <feature policy='require' name='umip'/>
+      <feature policy='require' name='vaes'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='disable' name='vme'/>
+      <feature policy='disable' name='xsavec'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index 6efa244ffa..3a5398f51f 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -52,30 +52,30 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='mds-no'/>
       <feature policy='require' name='pause-filter'/>
       <feature policy='require' name='pfthreshold'/>
-      <feature policy='require' name='v-vmsave-vmload'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='pschange-mc-no'/>
       <feature policy='require' name='rdctl-no'/>
       <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='v-vmsave-vmload'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='require' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
index 70a3b9c7d7..bf07530553 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -55,30 +55,30 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='mds-no'/>
       <feature policy='require' name='pause-filter'/>
       <feature policy='require' name='pfthreshold'/>
-      <feature policy='require' name='v-vmsave-vmload'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='pschange-mc-no'/>
       <feature policy='require' name='rdctl-no'/>
       <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='v-vmsave-vmload'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='require' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
index 0010cfa60e..ef9bb0c41b 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -46,38 +46,38 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='pcommit'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='vaes'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='fsrm'/>
-      <feature policy='require' name='fzrm'/>
-      <feature policy='require' name='fsrs'/>
-      <feature policy='require' name='fsrc'/>
-      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
+      <feature policy='require' name='3dnowext'/>
+      <feature policy='disable' name='3dnowprefetch'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='clwb'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='require' name='fsrc'/>
+      <feature policy='require' name='fsrm'/>
+      <feature policy='require' name='fsrs'/>
+      <feature policy='disable' name='fxsr_opt'/>
+      <feature policy='require' name='fzrm'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
+      <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='mpx'/>
       <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='disable' name='vme'/>
+      <feature policy='disable' name='nrip-save'/>
+      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='pcommit'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
       <feature policy='disable' name='rdseed'/>
       <feature policy='disable' name='sha-ni'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='3dnowprefetch'/>
-      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='svme-addr-chk'/>
       <feature policy='disable' name='topoext'/>
-      <feature policy='disable' name='fxsr_opt'/>
-      <feature policy='disable' name='nrip-save'/>
+      <feature policy='require' name='umip'/>
+      <feature policy='require' name='vaes'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='disable' name='vme'/>
+      <feature policy='disable' name='xsavec'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index ac8c8980e7..d014c918d5 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -52,30 +52,30 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='mds-no'/>
       <feature policy='require' name='pause-filter'/>
       <feature policy='require' name='pfthreshold'/>
-      <feature policy='require' name='v-vmsave-vmload'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='pschange-mc-no'/>
       <feature policy='require' name='rdctl-no'/>
       <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='v-vmsave-vmload'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='require' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
index e9d807828a..3c53244c4c 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -55,31 +55,31 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='lfence-always-serializing'/>
+      <feature policy='require' name='mds-no'/>
+      <feature policy='require' name='null-sel-clr-base'/>
       <feature policy='require' name='pause-filter'/>
       <feature policy='require' name='pfthreshold'/>
-      <feature policy='require' name='v-vmsave-vmload'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='lfence-always-serializing'/>
-      <feature policy='require' name='null-sel-clr-base'/>
+      <feature policy='require' name='pschange-mc-no'/>
       <feature policy='require' name='rdctl-no'/>
       <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='v-vmsave-vmload'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
index e834e3eb82..77e043c441 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -46,39 +46,39 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='pcommit'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='vaes'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='rdpid'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='fsrm'/>
-      <feature policy='require' name='fzrm'/>
-      <feature policy='require' name='fsrs'/>
-      <feature policy='require' name='fsrc'/>
-      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='xsaveerptr'/>
-      <feature policy='require' name='wbnoinvd'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='disable' name='vme'/>
-      <feature policy='disable' name='sha-ni'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='osvw'/>
-      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='3dnowext'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='clwb'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='require' name='fsrc'/>
+      <feature policy='require' name='fsrm'/>
+      <feature policy='require' name='fsrs'/>
       <feature policy='disable' name='fxsr_opt'/>
+      <feature policy='require' name='fzrm'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
+      <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='mpx'/>
+      <feature policy='require' name='npt'/>
       <feature policy='disable' name='nrip-save'/>
+      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='pcommit'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
+      <feature policy='require' name='rdpid'/>
+      <feature policy='disable' name='sha-ni'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='umip'/>
+      <feature policy='require' name='vaes'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='disable' name='vme'/>
+      <feature policy='require' name='wbnoinvd'/>
+      <feature policy='disable' name='xsavec'/>
+      <feature policy='require' name='xsaveerptr'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_8.1.0.s390x.xml b/tests/domaincapsdata/qemu_8.1.0.s390x.xml
index 37417ec648..0ab192607d 100644
--- a/tests/domaincapsdata/qemu_8.1.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.s390x.xml
@@ -42,44 +42,44 @@
     </mode>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>gen15a-base</model>
-      <feature policy='require' name='aen'/>
-      <feature policy='require' name='vxpdeh'/>
       <feature policy='require' name='aefsi'/>
-      <feature policy='require' name='diag318'/>
-      <feature policy='require' name='csske'/>
-      <feature policy='require' name='msa9'/>
-      <feature policy='require' name='msa8'/>
-      <feature policy='require' name='msa7'/>
-      <feature policy='require' name='msa6'/>
-      <feature policy='require' name='msa5'/>
-      <feature policy='require' name='msa4'/>
-      <feature policy='require' name='msa3'/>
-      <feature policy='require' name='msa2'/>
-      <feature policy='require' name='msa1'/>
-      <feature policy='require' name='sthyi'/>
-      <feature policy='require' name='edat'/>
-      <feature policy='require' name='deflate'/>
-      <feature policy='require' name='etoken'/>
-      <feature policy='require' name='vx'/>
-      <feature policy='require' name='ap'/>
-      <feature policy='require' name='vxeh'/>
-      <feature policy='require' name='vxpd'/>
-      <feature policy='require' name='esop'/>
-      <feature policy='require' name='msa9_pckmo'/>
-      <feature policy='require' name='vxeh2'/>
-      <feature policy='require' name='esort'/>
-      <feature policy='require' name='apft'/>
-      <feature policy='require' name='els'/>
-      <feature policy='require' name='iep'/>
-      <feature policy='require' name='apqci'/>
-      <feature policy='require' name='cte'/>
+      <feature policy='require' name='aen'/>
       <feature policy='require' name='ais'/>
+      <feature policy='require' name='ap'/>
+      <feature policy='require' name='apft'/>
+      <feature policy='require' name='apqci'/>
       <feature policy='require' name='bpb'/>
+      <feature policy='require' name='csske'/>
+      <feature policy='require' name='cte'/>
+      <feature policy='require' name='deflate'/>
+      <feature policy='require' name='diag318'/>
+      <feature policy='require' name='edat'/>
+      <feature policy='require' name='els'/>
+      <feature policy='require' name='esop'/>
+      <feature policy='require' name='esort'/>
+      <feature policy='require' name='etoken'/>
       <feature policy='require' name='gs'/>
+      <feature policy='require' name='iep'/>
+      <feature policy='require' name='msa1'/>
+      <feature policy='require' name='msa2'/>
+      <feature policy='require' name='msa3'/>
+      <feature policy='require' name='msa4'/>
+      <feature policy='require' name='msa5'/>
+      <feature policy='require' name='msa6'/>
+      <feature policy='require' name='msa7'/>
+      <feature policy='require' name='msa8'/>
+      <feature policy='require' name='msa9'/>
+      <feature policy='require' name='msa9_pckmo'/>
       <feature policy='require' name='ppa15'/>
-      <feature policy='require' name='zpci'/>
       <feature policy='require' name='sea_esop2'/>
+      <feature policy='require' name='sthyi'/>
       <feature policy='require' name='te'/>
+      <feature policy='require' name='vx'/>
+      <feature policy='require' name='vxeh'/>
+      <feature policy='require' name='vxeh2'/>
+      <feature policy='require' name='vxpd'/>
+      <feature policy='require' name='vxpdeh'/>
+      <feature policy='require' name='zpci'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='no' vendor='IBM'>gen15a</model>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 5de8bc1cd8..c66ea41621 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -52,31 +52,31 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='lfence-always-serializing'/>
+      <feature policy='require' name='mds-no'/>
+      <feature policy='require' name='null-sel-clr-base'/>
       <feature policy='require' name='pause-filter'/>
       <feature policy='require' name='pfthreshold'/>
-      <feature policy='require' name='v-vmsave-vmload'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='lfence-always-serializing'/>
-      <feature policy='require' name='null-sel-clr-base'/>
+      <feature policy='require' name='pschange-mc-no'/>
       <feature policy='require' name='rdctl-no'/>
       <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='v-vmsave-vmload'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
index a2f9591382..824dbc8a6c 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -55,32 +55,32 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='lfence-always-serializing'/>
+      <feature policy='require' name='mds-no'/>
+      <feature policy='require' name='null-sel-clr-base'/>
       <feature policy='require' name='pause-filter'/>
       <feature policy='require' name='pfthreshold'/>
-      <feature policy='require' name='v-vmsave-vmload'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='lfence-always-serializing'/>
-      <feature policy='require' name='null-sel-clr-base'/>
+      <feature policy='require' name='pschange-mc-no'/>
       <feature policy='require' name='rdctl-no'/>
       <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='v-vmsave-vmload'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index ac1c1b840e..69f48fe792 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -46,38 +46,38 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='pcommit'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='vaes'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='rdpid'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='fsrm'/>
-      <feature policy='require' name='fzrm'/>
-      <feature policy='require' name='fsrs'/>
-      <feature policy='require' name='fsrc'/>
-      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='xsaveerptr'/>
-      <feature policy='require' name='wbnoinvd'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='disable' name='vme'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='osvw'/>
-      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='3dnowext'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='clwb'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='require' name='fsrc'/>
+      <feature policy='require' name='fsrm'/>
+      <feature policy='require' name='fsrs'/>
       <feature policy='disable' name='fxsr_opt'/>
+      <feature policy='require' name='fzrm'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
+      <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='mpx'/>
+      <feature policy='require' name='npt'/>
       <feature policy='disable' name='nrip-save'/>
+      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='pcommit'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
+      <feature policy='require' name='rdpid'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='umip'/>
+      <feature policy='require' name='vaes'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='disable' name='vme'/>
+      <feature policy='require' name='wbnoinvd'/>
+      <feature policy='disable' name='xsavec'/>
+      <feature policy='require' name='xsaveerptr'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_8.2.0.s390x.xml b/tests/domaincapsdata/qemu_8.2.0.s390x.xml
index 84be7cd967..60d72ae0c9 100644
--- a/tests/domaincapsdata/qemu_8.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.s390x.xml
@@ -42,44 +42,44 @@
     </mode>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>gen15a-base</model>
-      <feature policy='require' name='aen'/>
-      <feature policy='require' name='vxpdeh'/>
       <feature policy='require' name='aefsi'/>
-      <feature policy='require' name='diag318'/>
-      <feature policy='require' name='csske'/>
-      <feature policy='require' name='msa9'/>
-      <feature policy='require' name='msa8'/>
-      <feature policy='require' name='msa7'/>
-      <feature policy='require' name='msa6'/>
-      <feature policy='require' name='msa5'/>
-      <feature policy='require' name='msa4'/>
-      <feature policy='require' name='msa3'/>
-      <feature policy='require' name='msa2'/>
-      <feature policy='require' name='msa1'/>
-      <feature policy='require' name='sthyi'/>
-      <feature policy='require' name='edat'/>
-      <feature policy='require' name='deflate'/>
-      <feature policy='require' name='etoken'/>
-      <feature policy='require' name='vx'/>
-      <feature policy='require' name='ap'/>
-      <feature policy='require' name='vxeh'/>
-      <feature policy='require' name='vxpd'/>
-      <feature policy='require' name='esop'/>
-      <feature policy='require' name='msa9_pckmo'/>
-      <feature policy='require' name='vxeh2'/>
-      <feature policy='require' name='esort'/>
-      <feature policy='require' name='apft'/>
-      <feature policy='require' name='els'/>
-      <feature policy='require' name='iep'/>
-      <feature policy='require' name='apqci'/>
-      <feature policy='require' name='cte'/>
+      <feature policy='require' name='aen'/>
       <feature policy='require' name='ais'/>
+      <feature policy='require' name='ap'/>
+      <feature policy='require' name='apft'/>
+      <feature policy='require' name='apqci'/>
       <feature policy='require' name='bpb'/>
+      <feature policy='require' name='csske'/>
+      <feature policy='require' name='cte'/>
+      <feature policy='require' name='deflate'/>
+      <feature policy='require' name='diag318'/>
+      <feature policy='require' name='edat'/>
+      <feature policy='require' name='els'/>
+      <feature policy='require' name='esop'/>
+      <feature policy='require' name='esort'/>
+      <feature policy='require' name='etoken'/>
       <feature policy='require' name='gs'/>
+      <feature policy='require' name='iep'/>
+      <feature policy='require' name='msa1'/>
+      <feature policy='require' name='msa2'/>
+      <feature policy='require' name='msa3'/>
+      <feature policy='require' name='msa4'/>
+      <feature policy='require' name='msa5'/>
+      <feature policy='require' name='msa6'/>
+      <feature policy='require' name='msa7'/>
+      <feature policy='require' name='msa8'/>
+      <feature policy='require' name='msa9'/>
+      <feature policy='require' name='msa9_pckmo'/>
       <feature policy='require' name='ppa15'/>
-      <feature policy='require' name='zpci'/>
       <feature policy='require' name='sea_esop2'/>
+      <feature policy='require' name='sthyi'/>
       <feature policy='require' name='te'/>
+      <feature policy='require' name='vx'/>
+      <feature policy='require' name='vxeh'/>
+      <feature policy='require' name='vxeh2'/>
+      <feature policy='require' name='vxpd'/>
+      <feature policy='require' name='vxpdeh'/>
+      <feature policy='require' name='zpci'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='no' vendor='IBM'>gen15a</model>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index e423689076..03dccfa0d5 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -52,32 +52,32 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='lfence-always-serializing'/>
+      <feature policy='require' name='mds-no'/>
+      <feature policy='require' name='null-sel-clr-base'/>
       <feature policy='require' name='pause-filter'/>
       <feature policy='require' name='pfthreshold'/>
-      <feature policy='require' name='v-vmsave-vmload'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='lfence-always-serializing'/>
-      <feature policy='require' name='null-sel-clr-base'/>
+      <feature policy='require' name='pschange-mc-no'/>
       <feature policy='require' name='rdctl-no'/>
       <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='v-vmsave-vmload'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
index 2851138ffe..aa7fc52574 100644
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -55,32 +55,32 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='lfence-always-serializing'/>
+      <feature policy='require' name='mds-no'/>
+      <feature policy='require' name='null-sel-clr-base'/>
       <feature policy='require' name='pause-filter'/>
       <feature policy='require' name='pfthreshold'/>
-      <feature policy='require' name='v-vmsave-vmload'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='lfence-always-serializing'/>
-      <feature policy='require' name='null-sel-clr-base'/>
+      <feature policy='require' name='pschange-mc-no'/>
       <feature policy='require' name='rdctl-no'/>
       <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='v-vmsave-vmload'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
index 253bed40ed..06e29bba93 100644
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -46,40 +46,40 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='pcommit'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='vaes'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='rdpid'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='fsrm'/>
-      <feature policy='require' name='cmpccxadd'/>
-      <feature policy='require' name='fzrm'/>
-      <feature policy='require' name='fsrs'/>
-      <feature policy='require' name='fsrc'/>
-      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='xsaveerptr'/>
-      <feature policy='require' name='wbnoinvd'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='disable' name='vme'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='osvw'/>
-      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='3dnowext'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='clwb'/>
+      <feature policy='require' name='cmpccxadd'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='require' name='fsrc'/>
+      <feature policy='require' name='fsrm'/>
+      <feature policy='require' name='fsrs'/>
       <feature policy='disable' name='fxsr_opt'/>
+      <feature policy='require' name='fzrm'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
+      <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='mpx'/>
+      <feature policy='require' name='npt'/>
       <feature policy='disable' name='nrip-save'/>
+      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='pcommit'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
+      <feature policy='require' name='rdpid'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='umip'/>
+      <feature policy='require' name='vaes'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='disable' name='vme'/>
+      <feature policy='require' name='wbnoinvd'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='disable' name='xsavec'/>
+      <feature policy='require' name='xsaveerptr'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index 2316859d5b..52af0811bb 100644
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -52,32 +52,32 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='lfence-always-serializing'/>
+      <feature policy='require' name='mds-no'/>
+      <feature policy='require' name='null-sel-clr-base'/>
       <feature policy='require' name='pause-filter'/>
       <feature policy='require' name='pfthreshold'/>
-      <feature policy='require' name='v-vmsave-vmload'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='lfence-always-serializing'/>
-      <feature policy='require' name='null-sel-clr-base'/>
+      <feature policy='require' name='pschange-mc-no'/>
       <feature policy='require' name='rdctl-no'/>
       <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='v-vmsave-vmload'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
index 1cf269504c..3d2f088d5f 100644
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -55,36 +55,36 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='overflow-recov'/>
-      <feature policy='require' name='succor'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
       <feature policy='require' name='flushbyasid'/>
+      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
+      <feature policy='require' name='lbrv'/>
+      <feature policy='require' name='lfence-always-serializing'/>
+      <feature policy='require' name='mds-no'/>
+      <feature policy='require' name='null-sel-clr-base'/>
+      <feature policy='require' name='overflow-recov'/>
       <feature policy='require' name='pause-filter'/>
       <feature policy='require' name='pfthreshold'/>
+      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='rdctl-no'/>
+      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='succor'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
       <feature policy='require' name='v-vmsave-vmload'/>
       <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='lfence-always-serializing'/>
-      <feature policy='require' name='null-sel-clr-base'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='gds-no'/>
-      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
index 76b2707b9c..734b630b38 100644
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -46,39 +46,39 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='vaes'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='rdpid'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='fsrm'/>
-      <feature policy='require' name='cmpccxadd'/>
-      <feature policy='require' name='fzrm'/>
-      <feature policy='require' name='fsrs'/>
-      <feature policy='require' name='fsrc'/>
-      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='xsaveerptr'/>
-      <feature policy='require' name='wbnoinvd'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='disable' name='vme'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='osvw'/>
-      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='3dnowext'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='clwb'/>
+      <feature policy='require' name='cmpccxadd'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='require' name='fsrc'/>
+      <feature policy='require' name='fsrm'/>
+      <feature policy='require' name='fsrs'/>
       <feature policy='disable' name='fxsr_opt'/>
+      <feature policy='require' name='fzrm'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
+      <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='mpx'/>
+      <feature policy='require' name='npt'/>
       <feature policy='disable' name='nrip-save'/>
+      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
+      <feature policy='require' name='rdpid'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='umip'/>
+      <feature policy='require' name='vaes'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='disable' name='vme'/>
+      <feature policy='require' name='wbnoinvd'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='disable' name='xsavec'/>
+      <feature policy='require' name='xsaveerptr'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_9.1.0.s390x.xml b/tests/domaincapsdata/qemu_9.1.0.s390x.xml
index bc62fdfaa4..7cd87e74ef 100644
--- a/tests/domaincapsdata/qemu_9.1.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.s390x.xml
@@ -42,61 +42,61 @@
     </mode>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>gen16a-base</model>
-      <feature policy='require' name='nnpa'/>
-      <feature policy='require' name='aen'/>
-      <feature policy='require' name='cmmnt'/>
-      <feature policy='require' name='vxpdeh'/>
       <feature policy='require' name='aefsi'/>
-      <feature policy='require' name='diag318'/>
-      <feature policy='require' name='csske'/>
-      <feature policy='require' name='mepoch'/>
-      <feature policy='require' name='msa9'/>
-      <feature policy='require' name='msa8'/>
-      <feature policy='require' name='msa7'/>
-      <feature policy='require' name='msa6'/>
-      <feature policy='require' name='msa5'/>
-      <feature policy='require' name='msa4'/>
-      <feature policy='require' name='msa3'/>
-      <feature policy='require' name='msa2'/>
-      <feature policy='require' name='msa1'/>
-      <feature policy='require' name='sthyi'/>
-      <feature policy='require' name='edat'/>
-      <feature policy='require' name='ri'/>
-      <feature policy='require' name='deflate'/>
-      <feature policy='require' name='edat2'/>
-      <feature policy='require' name='etoken'/>
-      <feature policy='require' name='vx'/>
-      <feature policy='require' name='ipter'/>
-      <feature policy='require' name='pai'/>
-      <feature policy='require' name='paie'/>
-      <feature policy='require' name='mepochptff'/>
+      <feature policy='require' name='aen'/>
+      <feature policy='require' name='ais'/>
       <feature policy='require' name='ap'/>
-      <feature policy='require' name='vxeh'/>
-      <feature policy='require' name='vxpd'/>
-      <feature policy='require' name='esop'/>
-      <feature policy='require' name='msa9_pckmo'/>
-      <feature policy='require' name='vxeh2'/>
-      <feature policy='require' name='esort'/>
-      <feature policy='require' name='appv'/>
-      <feature policy='require' name='apqi'/>
       <feature policy='require' name='apft'/>
-      <feature policy='require' name='els'/>
-      <feature policy='require' name='iep'/>
+      <feature policy='require' name='appv'/>
       <feature policy='require' name='appvi'/>
       <feature policy='require' name='apqci'/>
-      <feature policy='require' name='cte'/>
-      <feature policy='require' name='ais'/>
-      <feature policy='require' name='bpb'/>
-      <feature policy='require' name='ctop'/>
-      <feature policy='require' name='gs'/>
-      <feature policy='require' name='ppa15'/>
-      <feature policy='require' name='zpci'/>
-      <feature policy='require' name='rdp'/>
-      <feature policy='require' name='sea_esop2'/>
+      <feature policy='require' name='apqi'/>
       <feature policy='require' name='beareh'/>
-      <feature policy='require' name='te'/>
+      <feature policy='require' name='bpb'/>
       <feature policy='require' name='cmm'/>
+      <feature policy='require' name='cmmnt'/>
+      <feature policy='require' name='csske'/>
+      <feature policy='require' name='cte'/>
+      <feature policy='require' name='ctop'/>
+      <feature policy='require' name='deflate'/>
+      <feature policy='require' name='diag318'/>
+      <feature policy='require' name='edat'/>
+      <feature policy='require' name='edat2'/>
+      <feature policy='require' name='els'/>
+      <feature policy='require' name='esop'/>
+      <feature policy='require' name='esort'/>
+      <feature policy='require' name='etoken'/>
+      <feature policy='require' name='gs'/>
+      <feature policy='require' name='iep'/>
+      <feature policy='require' name='ipter'/>
+      <feature policy='require' name='mepoch'/>
+      <feature policy='require' name='mepochptff'/>
+      <feature policy='require' name='msa1'/>
+      <feature policy='require' name='msa2'/>
+      <feature policy='require' name='msa3'/>
+      <feature policy='require' name='msa4'/>
+      <feature policy='require' name='msa5'/>
+      <feature policy='require' name='msa6'/>
+      <feature policy='require' name='msa7'/>
+      <feature policy='require' name='msa8'/>
+      <feature policy='require' name='msa9'/>
+      <feature policy='require' name='msa9_pckmo'/>
+      <feature policy='require' name='nnpa'/>
+      <feature policy='require' name='pai'/>
+      <feature policy='require' name='paie'/>
+      <feature policy='require' name='ppa15'/>
+      <feature policy='require' name='rdp'/>
+      <feature policy='require' name='ri'/>
+      <feature policy='require' name='sea_esop2'/>
+      <feature policy='require' name='sthyi'/>
+      <feature policy='require' name='te'/>
+      <feature policy='require' name='vx'/>
+      <feature policy='require' name='vxeh'/>
+      <feature policy='require' name='vxeh2'/>
+      <feature policy='require' name='vxpd'/>
+      <feature policy='require' name='vxpdeh'/>
       <feature policy='require' name='vxpdeh2'/>
+      <feature policy='require' name='zpci'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='IBM'>gen15a</model>
diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index baaa17f68d..77de6d9edd 100644
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -52,36 +52,36 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='overflow-recov'/>
-      <feature policy='require' name='succor'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
       <feature policy='require' name='flushbyasid'/>
+      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='invtsc'/>
+      <feature policy='require' name='lbrv'/>
+      <feature policy='require' name='lfence-always-serializing'/>
+      <feature policy='require' name='mds-no'/>
+      <feature policy='require' name='null-sel-clr-base'/>
+      <feature policy='require' name='overflow-recov'/>
       <feature policy='require' name='pause-filter'/>
       <feature policy='require' name='pfthreshold'/>
+      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='rdctl-no'/>
+      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='succor'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
       <feature policy='require' name='v-vmsave-vmload'/>
       <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='lfence-always-serializing'/>
-      <feature policy='require' name='null-sel-clr-base'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='gds-no'/>
-      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64+amdsev.xml
index a21c69e416..28bb9abdf1 100644
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64+amdsev.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64+amdsev.xml
@@ -55,37 +55,37 @@
       <model fallback='forbid'>EPYC-Genoa</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='spec-ctrl'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='flush-l1d'/>
       <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
       <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='overflow-recov'/>
-      <feature policy='require' name='succor'/>
-      <feature policy='require' name='invtsc'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='flush-l1d'/>
       <feature policy='require' name='flushbyasid'/>
+      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='ibpb-brtype'/>
+      <feature policy='require' name='invtsc'/>
+      <feature policy='require' name='lbrv'/>
+      <feature policy='require' name='mds-no'/>
+      <feature policy='require' name='overflow-recov'/>
       <feature policy='require' name='pause-filter'/>
+      <feature policy='require' name='perfmon-v2'/>
       <feature policy='require' name='pfthreshold'/>
+      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='rdctl-no'/>
+      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='sbpb'/>
+      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='spec-ctrl'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='succor'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
       <feature policy='require' name='v-vmsave-vmload'/>
       <feature policy='require' name='vgif'/>
-      <feature policy='require' name='sbpb'/>
-      <feature policy='require' name='ibpb-brtype'/>
-      <feature policy='require' name='perfmon-v2'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='gds-no'/>
-      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
index df0d995276..fa3889a38a 100644
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -55,37 +55,37 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='overflow-recov'/>
-      <feature policy='require' name='succor'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
       <feature policy='require' name='flushbyasid'/>
+      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='ibpb-brtype'/>
+      <feature policy='require' name='invtsc'/>
+      <feature policy='require' name='lbrv'/>
+      <feature policy='require' name='lfence-always-serializing'/>
+      <feature policy='require' name='mds-no'/>
+      <feature policy='require' name='null-sel-clr-base'/>
+      <feature policy='require' name='overflow-recov'/>
       <feature policy='require' name='pause-filter'/>
       <feature policy='require' name='pfthreshold'/>
+      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='rdctl-no'/>
+      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='succor'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
       <feature policy='require' name='v-vmsave-vmload'/>
       <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='lfence-always-serializing'/>
-      <feature policy='require' name='null-sel-clr-base'/>
-      <feature policy='require' name='ibpb-brtype'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='gds-no'/>
-      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64+amdsev.xml
index 2b860a23ca..2f85382971 100644
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64+amdsev.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64+amdsev.xml
@@ -46,39 +46,39 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='vaes'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='rdpid'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='fsrm'/>
-      <feature policy='require' name='cmpccxadd'/>
-      <feature policy='require' name='fzrm'/>
-      <feature policy='require' name='fsrs'/>
-      <feature policy='require' name='fsrc'/>
-      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='xsaveerptr'/>
-      <feature policy='require' name='wbnoinvd'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='disable' name='vme'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='osvw'/>
-      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='3dnowext'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='clwb'/>
+      <feature policy='require' name='cmpccxadd'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='require' name='fsrc'/>
+      <feature policy='require' name='fsrm'/>
+      <feature policy='require' name='fsrs'/>
       <feature policy='disable' name='fxsr_opt'/>
+      <feature policy='require' name='fzrm'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
+      <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='mpx'/>
+      <feature policy='require' name='npt'/>
       <feature policy='disable' name='nrip-save'/>
+      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
+      <feature policy='require' name='rdpid'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='umip'/>
+      <feature policy='require' name='vaes'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='disable' name='vme'/>
+      <feature policy='require' name='wbnoinvd'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='disable' name='xsavec'/>
+      <feature policy='require' name='xsaveerptr'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
index 24113a3514..49ad050fc3 100644
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -46,39 +46,39 @@
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy='require' name='monitor'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='erms'/>
-      <feature policy='require' name='mpx'/>
-      <feature policy='require' name='clwb'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='pku'/>
-      <feature policy='require' name='vaes'/>
-      <feature policy='require' name='la57'/>
-      <feature policy='require' name='rdpid'/>
-      <feature policy='require' name='pks'/>
-      <feature policy='require' name='fsrm'/>
-      <feature policy='require' name='cmpccxadd'/>
-      <feature policy='require' name='fzrm'/>
-      <feature policy='require' name='fsrs'/>
-      <feature policy='require' name='fsrc'/>
-      <feature policy='require' name='3dnowext'/>
       <feature policy='require' name='3dnow'/>
-      <feature policy='require' name='xsaveerptr'/>
-      <feature policy='require' name='wbnoinvd'/>
-      <feature policy='require' name='npt'/>
-      <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='disable' name='vme'/>
-      <feature policy='disable' name='xsavec'/>
-      <feature policy='disable' name='misalignsse'/>
-      <feature policy='disable' name='osvw'/>
-      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='3dnowext'/>
+      <feature policy='require' name='acpi'/>
+      <feature policy='require' name='clwb'/>
+      <feature policy='require' name='cmpccxadd'/>
+      <feature policy='require' name='erms'/>
+      <feature policy='require' name='fsrc'/>
+      <feature policy='require' name='fsrm'/>
+      <feature policy='require' name='fsrs'/>
       <feature policy='disable' name='fxsr_opt'/>
+      <feature policy='require' name='fzrm'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='la57'/>
+      <feature policy='disable' name='misalignsse'/>
+      <feature policy='require' name='monitor'/>
+      <feature policy='require' name='mpx'/>
+      <feature policy='require' name='npt'/>
       <feature policy='disable' name='nrip-save'/>
+      <feature policy='disable' name='osvw'/>
+      <feature policy='require' name='pks'/>
+      <feature policy='require' name='pku'/>
+      <feature policy='require' name='rdpid'/>
+      <feature policy='require' name='ss'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='disable' name='topoext'/>
+      <feature policy='require' name='umip'/>
+      <feature policy='require' name='vaes'/>
+      <feature policy='require' name='vgif'/>
+      <feature policy='disable' name='vme'/>
+      <feature policy='require' name='wbnoinvd'/>
+      <feature policy='require' name='x2apic'/>
+      <feature policy='disable' name='xsavec'/>
+      <feature policy='require' name='xsaveerptr'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_9.2.0.s390x.xml b/tests/domaincapsdata/qemu_9.2.0.s390x.xml
index bba9ce7558..150ee03eca 100644
--- a/tests/domaincapsdata/qemu_9.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.s390x.xml
@@ -42,61 +42,61 @@
     </mode>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>gen16a-base</model>
-      <feature policy='require' name='nnpa'/>
-      <feature policy='require' name='aen'/>
-      <feature policy='require' name='cmmnt'/>
-      <feature policy='require' name='vxpdeh'/>
       <feature policy='require' name='aefsi'/>
-      <feature policy='require' name='diag318'/>
-      <feature policy='require' name='csske'/>
-      <feature policy='require' name='mepoch'/>
-      <feature policy='require' name='msa9'/>
-      <feature policy='require' name='msa8'/>
-      <feature policy='require' name='msa7'/>
-      <feature policy='require' name='msa6'/>
-      <feature policy='require' name='msa5'/>
-      <feature policy='require' name='msa4'/>
-      <feature policy='require' name='msa3'/>
-      <feature policy='require' name='msa2'/>
-      <feature policy='require' name='msa1'/>
-      <feature policy='require' name='sthyi'/>
-      <feature policy='require' name='edat'/>
-      <feature policy='require' name='ri'/>
-      <feature policy='require' name='deflate'/>
-      <feature policy='require' name='edat2'/>
-      <feature policy='require' name='etoken'/>
-      <feature policy='require' name='vx'/>
-      <feature policy='require' name='ipter'/>
-      <feature policy='require' name='pai'/>
-      <feature policy='require' name='paie'/>
-      <feature policy='require' name='mepochptff'/>
+      <feature policy='require' name='aen'/>
+      <feature policy='require' name='ais'/>
       <feature policy='require' name='ap'/>
-      <feature policy='require' name='vxeh'/>
-      <feature policy='require' name='vxpd'/>
-      <feature policy='require' name='esop'/>
-      <feature policy='require' name='msa9_pckmo'/>
-      <feature policy='require' name='vxeh2'/>
-      <feature policy='require' name='esort'/>
-      <feature policy='require' name='appv'/>
-      <feature policy='require' name='apqi'/>
       <feature policy='require' name='apft'/>
-      <feature policy='require' name='els'/>
-      <feature policy='require' name='iep'/>
+      <feature policy='require' name='appv'/>
       <feature policy='require' name='appvi'/>
       <feature policy='require' name='apqci'/>
-      <feature policy='require' name='cte'/>
-      <feature policy='require' name='ais'/>
-      <feature policy='require' name='bpb'/>
-      <feature policy='require' name='ctop'/>
-      <feature policy='require' name='gs'/>
-      <feature policy='require' name='ppa15'/>
-      <feature policy='require' name='zpci'/>
-      <feature policy='require' name='rdp'/>
-      <feature policy='require' name='sea_esop2'/>
+      <feature policy='require' name='apqi'/>
       <feature policy='require' name='beareh'/>
-      <feature policy='require' name='te'/>
+      <feature policy='require' name='bpb'/>
       <feature policy='require' name='cmm'/>
+      <feature policy='require' name='cmmnt'/>
+      <feature policy='require' name='csske'/>
+      <feature policy='require' name='cte'/>
+      <feature policy='require' name='ctop'/>
+      <feature policy='require' name='deflate'/>
+      <feature policy='require' name='diag318'/>
+      <feature policy='require' name='edat'/>
+      <feature policy='require' name='edat2'/>
+      <feature policy='require' name='els'/>
+      <feature policy='require' name='esop'/>
+      <feature policy='require' name='esort'/>
+      <feature policy='require' name='etoken'/>
+      <feature policy='require' name='gs'/>
+      <feature policy='require' name='iep'/>
+      <feature policy='require' name='ipter'/>
+      <feature policy='require' name='mepoch'/>
+      <feature policy='require' name='mepochptff'/>
+      <feature policy='require' name='msa1'/>
+      <feature policy='require' name='msa2'/>
+      <feature policy='require' name='msa3'/>
+      <feature policy='require' name='msa4'/>
+      <feature policy='require' name='msa5'/>
+      <feature policy='require' name='msa6'/>
+      <feature policy='require' name='msa7'/>
+      <feature policy='require' name='msa8'/>
+      <feature policy='require' name='msa9'/>
+      <feature policy='require' name='msa9_pckmo'/>
+      <feature policy='require' name='nnpa'/>
+      <feature policy='require' name='pai'/>
+      <feature policy='require' name='paie'/>
+      <feature policy='require' name='ppa15'/>
+      <feature policy='require' name='rdp'/>
+      <feature policy='require' name='ri'/>
+      <feature policy='require' name='sea_esop2'/>
+      <feature policy='require' name='sthyi'/>
+      <feature policy='require' name='te'/>
+      <feature policy='require' name='vx'/>
+      <feature policy='require' name='vxeh'/>
+      <feature policy='require' name='vxeh2'/>
+      <feature policy='require' name='vxpd'/>
+      <feature policy='require' name='vxpdeh'/>
       <feature policy='require' name='vxpdeh2'/>
+      <feature policy='require' name='zpci'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='IBM'>gen15a</model>
diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64+amdsev.xml
index f12c89f40b..96b465787b 100644
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64+amdsev.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64+amdsev.xml
@@ -52,37 +52,37 @@
       <model fallback='forbid'>EPYC-Genoa</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='spec-ctrl'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='flush-l1d'/>
       <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
       <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='overflow-recov'/>
-      <feature policy='require' name='succor'/>
-      <feature policy='require' name='invtsc'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='flush-l1d'/>
       <feature policy='require' name='flushbyasid'/>
+      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='ibpb-brtype'/>
+      <feature policy='require' name='invtsc'/>
+      <feature policy='require' name='lbrv'/>
+      <feature policy='require' name='mds-no'/>
+      <feature policy='require' name='overflow-recov'/>
       <feature policy='require' name='pause-filter'/>
+      <feature policy='require' name='perfmon-v2'/>
       <feature policy='require' name='pfthreshold'/>
+      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='rdctl-no'/>
+      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='sbpb'/>
+      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='spec-ctrl'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='succor'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
       <feature policy='require' name='v-vmsave-vmload'/>
       <feature policy='require' name='vgif'/>
-      <feature policy='require' name='sbpb'/>
-      <feature policy='require' name='ibpb-brtype'/>
-      <feature policy='require' name='perfmon-v2'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='gds-no'/>
-      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index 529415bcb4..886038b384 100644
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -52,37 +52,37 @@
       <model fallback='forbid'>EPYC-Rome</model>
       <vendor>AMD</vendor>
       <maxphysaddr mode='passthrough' limit='64'/>
-      <feature policy='require' name='x2apic'/>
-      <feature policy='require' name='tsc-deadline'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='stibp'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='ssbd'/>
-      <feature policy='require' name='cmp_legacy'/>
-      <feature policy='require' name='overflow-recov'/>
-      <feature policy='require' name='succor'/>
-      <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
-      <feature policy='require' name='virt-ssbd'/>
-      <feature policy='require' name='lbrv'/>
-      <feature policy='require' name='tsc-scale'/>
-      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='arch-capabilities'/>
+      <feature policy='require' name='cmp_legacy'/>
       <feature policy='require' name='flushbyasid'/>
+      <feature policy='require' name='gds-no'/>
+      <feature policy='require' name='hypervisor'/>
+      <feature policy='require' name='ibpb-brtype'/>
+      <feature policy='require' name='invtsc'/>
+      <feature policy='require' name='lbrv'/>
+      <feature policy='require' name='lfence-always-serializing'/>
+      <feature policy='require' name='mds-no'/>
+      <feature policy='require' name='null-sel-clr-base'/>
+      <feature policy='require' name='overflow-recov'/>
       <feature policy='require' name='pause-filter'/>
       <feature policy='require' name='pfthreshold'/>
+      <feature policy='require' name='pschange-mc-no'/>
+      <feature policy='require' name='rdctl-no'/>
+      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='skip-l1dfl-vmentry'/>
+      <feature policy='require' name='ssbd'/>
+      <feature policy='require' name='stibp'/>
+      <feature policy='require' name='succor'/>
+      <feature policy='require' name='svme-addr-chk'/>
+      <feature policy='require' name='tsc-deadline'/>
+      <feature policy='require' name='tsc-scale'/>
+      <feature policy='require' name='tsc_adjust'/>
       <feature policy='require' name='v-vmsave-vmload'/>
       <feature policy='require' name='vgif'/>
-      <feature policy='require' name='svme-addr-chk'/>
-      <feature policy='require' name='lfence-always-serializing'/>
-      <feature policy='require' name='null-sel-clr-base'/>
-      <feature policy='require' name='ibpb-brtype'/>
-      <feature policy='require' name='rdctl-no'/>
-      <feature policy='require' name='skip-l1dfl-vmentry'/>
-      <feature policy='require' name='mds-no'/>
-      <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='require' name='gds-no'/>
-      <feature policy='require' name='rfds-no'/>
+      <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='vmcb-clean'/>
+      <feature policy='require' name='x2apic'/>
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-- 
2.54.0