[PATCH 6/7] qemuxmlconftest: x86_64: Bump 'firmware*' test cases to 'pc-q35-10.0'

[Peter Krempa via Devel]

From: Peter Krempa <pkre...@redhat.com>

New qemu is deprecating 'pc-q35-4.0-machine', update to the latest
released machine type.

Apart from the previous cases where we could use the aliased machine
type, the firmware auto-selection doesn't work properly for the
unexpanded 'q35' alias and thus we need to use a real machine type here.

Outside of tests a real machine type would be filled anyways, the use of
the alias happens only inside our '-latest' test suite.

Signed-off-by: Peter Krempa <pkre...@redhat.com>
---
 tests/qemuxmlconfdata/firmware-auto-bios-not-stateless.xml      | 2 +-
 tests/qemuxmlconfdata/firmware-auto-bios-nvram.xml              | 2 +-
 .../firmware-auto-bios-stateless.x86_64-latest.args             | 2 +-
 .../firmware-auto-bios-stateless.x86_64-latest.xml              | 2 +-
 tests/qemuxmlconfdata/firmware-auto-bios-stateless.xml          | 2 +-
 tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args     | 2 +-
 tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml      | 2 +-
 tests/qemuxmlconfdata/firmware-auto-bios.xml                    | 2 +-
 .../firmware-auto-efi-enrolled-keys-no-secboot.xml              | 2 +-
 .../firmware-auto-efi-enrolled-keys.x86_64-latest.args          | 2 +-
 .../firmware-auto-efi-enrolled-keys.x86_64-latest.xml           | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.xml       | 2 +-
 ...e-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args | 2 +-
 ...re-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.xml | 2 +-
 .../firmware-auto-efi-format-loader-qcow2-nvram-path.xml        | 2 +-
 .../firmware-auto-efi-format-loader-qcow2.x86_64-latest.args    | 2 +-
 .../firmware-auto-efi-format-loader-qcow2.x86_64-latest.xml     | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.xml | 2 +-
 .../firmware-auto-efi-format-mismatch.x86_64-latest.args        | 2 +-
 .../firmware-auto-efi-format-mismatch.x86_64-latest.xml         | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.xml     | 2 +-
 ...firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args | 2 +-
 .../firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.xml | 2 +-
 .../firmware-auto-efi-format-nvram-qcow2-path.xml               | 2 +-
 .../firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args     | 2 +-
 .../firmware-auto-efi-format-nvram-qcow2.x86_64-latest.xml      | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.xml  | 2 +-
 .../firmware-auto-efi-loader-insecure.x86_64-latest.args        | 2 +-
 .../firmware-auto-efi-loader-insecure.x86_64-latest.xml         | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.xml     | 2 +-
 .../firmware-auto-efi-loader-path-nonstandard.x86_64-latest.xml | 2 +-
 .../firmware-auto-efi-loader-path-nonstandard.xml               | 2 +-
 .../firmware-auto-efi-loader-path.x86_64-latest.args            | 2 +-
 .../firmware-auto-efi-loader-path.x86_64-latest.xml             | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi-loader-path.xml         | 2 +-
 ...irmware-auto-efi-loader-secure.x86_64-latest.abi-update.args | 2 +-
 ...firmware-auto-efi-loader-secure.x86_64-latest.abi-update.xml | 2 +-
 .../firmware-auto-efi-loader-secure.x86_64-latest.args          | 2 +-
 .../firmware-auto-efi-loader-secure.x86_64-latest.xml           | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.xml       | 2 +-
 .../firmware-auto-efi-no-enrolled-keys.x86_64-latest.args       | 2 +-
 .../firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml        | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.xml    | 2 +-
 .../firmware-auto-efi-no-secboot.x86_64-latest.args             | 2 +-
 .../firmware-auto-efi-no-secboot.x86_64-latest.xml              | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.xml          | 2 +-
 .../firmware-auto-efi-nvram-path.x86_64-latest.args             | 2 +-
 .../firmware-auto-efi-nvram-path.x86_64-latest.xml              | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.xml          | 2 +-
 ...rmware-auto-efi-nvram-template-nonstandard.x86_64-latest.xml | 2 +-
 .../firmware-auto-efi-nvram-template-nonstandard.xml            | 2 +-
 .../firmware-auto-efi-nvram-template.x86_64-latest.args         | 2 +-
 .../firmware-auto-efi-nvram-template.x86_64-latest.xml          | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.xml      | 2 +-
 .../firmware-auto-efi-rw-pflash.x86_64-latest.xml               | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.xml           | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.xml    | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi-rw.xml                  | 2 +-
 .../firmware-auto-efi-secboot.x86_64-latest.args                | 2 +-
 .../qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.xml | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi-secboot.xml             | 2 +-
 .../firmware-auto-efi-smm-off.x86_64-latest.args                | 2 +-
 .../qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.xml | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi-smm-off.xml             | 2 +-
 .../firmware-auto-efi-stateless.x86_64-latest.args              | 2 +-
 .../firmware-auto-efi-stateless.x86_64-latest.xml               | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi-stateless.xml           | 2 +-
 .../firmware-auto-efi.x86_64-latest.abi-update.args             | 2 +-
 .../firmware-auto-efi.x86_64-latest.abi-update.xml              | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args      | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.xml       | 2 +-
 tests/qemuxmlconfdata/firmware-auto-efi.xml                     | 2 +-
 .../firmware-manual-efi-acpi-q35.x86_64-latest.args             | 2 +-
 .../firmware-manual-efi-acpi-q35.x86_64-latest.xml              | 2 +-
 tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.xml          | 2 +-
 ...rmware-manual-efi-loader-path-nonstandard.x86_64-latest.args | 2 +-
 ...irmware-manual-efi-loader-path-nonstandard.x86_64-latest.xml | 2 +-
 .../firmware-manual-efi-loader-path-nonstandard.xml             | 2 +-
 .../firmware-manual-efi-loader-secure.x86_64-latest.args        | 2 +-
 .../firmware-manual-efi-loader-secure.x86_64-latest.xml         | 2 +-
 tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.xml     | 2 +-
 ...-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.args | 2 +-
 ...e-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.xml | 2 +-
 .../firmware-manual-efi-no-enrolled-keys-legacy-paths.xml       | 2 +-
 .../firmware-manual-efi-no-enrolled-keys.x86_64-latest.args     | 2 +-
 .../firmware-manual-efi-no-enrolled-keys.x86_64-latest.xml      | 2 +-
 tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.xml  | 2 +-
 ...rmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.args | 2 +-
 ...irmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.xml | 2 +-
 .../firmware-manual-efi-no-secboot-legacy-paths.xml             | 2 +-
 .../firmware-manual-efi-no-secboot.x86_64-latest.args           | 2 +-
 .../firmware-manual-efi-no-secboot.x86_64-latest.xml            | 2 +-
 tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.xml        | 2 +-
 tests/qemuxmlconfdata/firmware-manual-efi-noacpi-q35.xml        | 2 +-
 ...are-manual-efi-nvram-template-nonstandard.x86_64-latest.args | 2 +-
 ...ware-manual-efi-nvram-template-nonstandard.x86_64-latest.xml | 2 +-
 .../firmware-manual-efi-nvram-template-nonstandard.xml          | 2 +-
 .../firmware-manual-efi-rw-legacy-paths.x86_64-latest.args      | 2 +-
 .../firmware-manual-efi-rw-legacy-paths.x86_64-latest.xml       | 2 +-
 tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.xml   | 2 +-
 .../firmware-manual-efi-rw-modern-paths.x86_64-latest.args      | 2 +-
 .../firmware-manual-efi-rw-modern-paths.x86_64-latest.xml       | 2 +-
 tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.xml   | 2 +-
 .../firmware-manual-efi-secboot-legacy-paths.x86_64-latest.args | 2 +-
 .../firmware-manual-efi-secboot-legacy-paths.x86_64-latest.xml  | 2 +-
 .../firmware-manual-efi-secboot-legacy-paths.xml                | 2 +-
 .../firmware-manual-efi-secboot.x86_64-latest.args              | 2 +-
 .../firmware-manual-efi-secboot.x86_64-latest.xml               | 2 +-
 tests/qemuxmlconfdata/firmware-manual-efi-secboot.xml           | 2 +-
 .../firmware-manual-noefi-acpi-q35.x86_64-latest.args           | 2 +-
 .../firmware-manual-noefi-acpi-q35.x86_64-latest.xml            | 2 +-
 tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.xml        | 2 +-
 .../firmware-manual-noefi-noacpi-q35.x86_64-latest.args         | 2 +-
 .../firmware-manual-noefi-noacpi-q35.x86_64-latest.xml          | 2 +-
 tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.xml      | 2 +-
 115 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/tests/qemuxmlconfdata/firmware-auto-bios-not-stateless.xml 
b/tests/qemuxmlconfdata/firmware-auto-bios-not-stateless.xml
index a1f21e9bb4..47114a2b50 100644
--- a/tests/qemuxmlconfdata/firmware-auto-bios-not-stateless.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-bios-not-stateless.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader stateless='no'/>
   </os>
   <features>
diff --git a/tests/qemuxmlconfdata/firmware-auto-bios-nvram.xml 
b/tests/qemuxmlconfdata/firmware-auto-bios-nvram.xml
index c87debdb01..094b603362 100644
--- a/tests/qemuxmlconfdata/firmware-auto-bios-nvram.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-bios-nvram.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <features>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args
index 0efb878bb2..a6a52e2b52 100644
--- a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -name guest=guest,debug-threads=on \
 -S \
 -object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}'
 \
--machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
+-machine pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on 
\
 -accel kvm \
 -cpu qemu64 \
 -bios /usr/share/seabios/bios-256k.bin \
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.xml
index 31b83b5593..547dff5ed3 100644
--- a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='no' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.xml 
b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.xml
index 540f61a2b8..6276ac7ef5 100644
--- a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader stateless='yes'/>
   </os>
   <features>
diff --git a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args
index 0efb878bb2..a6a52e2b52 100644
--- a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -name guest=guest,debug-threads=on \
 -S \
 -object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}'
 \
--machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
+-machine pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on 
\
 -accel kvm \
 -cpu qemu64 \
 -bios /usr/share/seabios/bios-256k.bin \
diff --git a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml
index d7471baa61..ae9c9f56d9 100644
--- a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='no' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-bios.xml 
b/tests/qemuxmlconfdata/firmware-auto-bios.xml
index 1911b40ae7..92464ca941 100644
--- a/tests/qemuxmlconfdata/firmware-auto-bios.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-bios.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
   </os>
   <features>
     <acpi/>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-no-secboot.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-no-secboot.xml
index 897da8e126..560905dd39 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-no-secboot.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-no-secboot.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='yes' name='enrolled-keys'/>
       <feature enabled='no' name='secure-boot'/>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args
index 1bdd482d71..e7c9110c95 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.xml
index 79ab55751b..f4df8c07ed 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='yes' name='enrolled-keys'/>
       <feature enabled='yes' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.xml
index 01bba19a32..2447093295 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='yes' name='enrolled-keys'/>
     </firmware>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args
 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args
index 2694e0676f..25b93c8a2e 100644
--- 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args
+++ 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"qcow2","file":"libvirt-pflash0-storage","backing":null}'
 \
 -blockdev 
'{"driver":"file","filename":"/path/to/guest_VARS.qcow2","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"qcow2","file":"libvirt-pflash1-storage","backing":null}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.xml
 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.xml
index dd044ac091..70d49c3bb5 100644
--- 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.xml
+++ 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='yes' name='enrolled-keys'/>
       <feature enabled='yes' name='secure-boot'/>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.xml
index 75fa44fd20..03794d53c0 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader format='qcow2'/>
     <nvram>/path/to/guest_VARS.qcow2</nvram>
   </os>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.args
 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.args
index 2bc7a1b9d5..468ad4326c 100644
--- 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.args
+++ 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"qcow2","file":"libvirt-pflash0-storage","backing":null}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.qcow2","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"qcow2","file":"libvirt-pflash1-storage","backing":null}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.xml
index 7cdc7eec1f..4061a0ae35 100644
--- 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.xml
+++ 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='yes' name='enrolled-keys'/>
       <feature enabled='yes' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.xml
index 4d4bea8ff8..7a8eeb9ffd 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader format='qcow2'/>
   </os>
   <features>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest.args
index 1bdd482d71..e7c9110c95 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest.xml
index 79ab55751b..f4df8c07ed 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='yes' name='enrolled-keys'/>
       <feature enabled='yes' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.xml
index 6caec1a94c..7c2f01eefb 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader format='raw'/>
     <nvram format='qcow2'/>
   </os>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args
 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args
index 2694e0676f..25b93c8a2e 100644
--- 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args
+++ 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"qcow2","file":"libvirt-pflash0-storage","backing":null}'
 \
 -blockdev 
'{"driver":"file","filename":"/path/to/guest_VARS.qcow2","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"qcow2","file":"libvirt-pflash1-storage","backing":null}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.xml
 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.xml
index dd044ac091..70d49c3bb5 100644
--- 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.xml
+++ 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='yes' name='enrolled-keys'/>
       <feature enabled='yes' name='secure-boot'/>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.xml
index fe67aa8edf..4a850e2d25 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <nvram format='qcow2'>/path/to/guest_VARS.qcow2</nvram>
   </os>
   <features>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args
index 2bc7a1b9d5..468ad4326c 100644
--- 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args
+++ 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"qcow2","file":"libvirt-pflash0-storage","backing":null}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.qcow2","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"qcow2","file":"libvirt-pflash1-storage","backing":null}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.xml
index 7cdc7eec1f..4061a0ae35 100644
--- 
a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.xml
+++ 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='yes' name='enrolled-keys'/>
       <feature enabled='yes' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.xml
index 6da8374ec6..e5eca098f8 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <nvram format='qcow2'/>
   </os>
   <features>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest.args
index 0ecac2fda1..cbafadec2c 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -m size=1048576k \
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest.xml
index 28da16a5b4..9d06cf64aa 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='no' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.xml
index 08ddfe3cfe..5799448ade 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader secure='no'/>
   </os>
   <features>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.x86_64-latest.xml
 
b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.x86_64-latest.xml
index 1f09253a16..0b2dcf8386 100644
--- 
a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.x86_64-latest.xml
+++ 
b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' type='pflash' 
format='raw'>/path/to/OVMF_CODE.fd</loader>
     <boot dev='hd'/>
   </os>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.xml
index daec5989d5..67fa58ec4b 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/path/to/OVMF_CODE.fd</loader>
   </os>
   <features>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.args
index 0ecac2fda1..cbafadec2c 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -m size=1048576k \
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.xml
index e85b1be965..4699c24bb5 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='no' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.xml
index 36bc8f7735..6beb155045 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' 
type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
   </os>
   <features>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.abi-update.args
 
b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.abi-update.args
index 2bc7a1b9d5..468ad4326c 100644
--- 
a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.abi-update.args
+++ 
b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.abi-update.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"qcow2","file":"libvirt-pflash0-storage","backing":null}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.qcow2","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"qcow2","file":"libvirt-pflash1-storage","backing":null}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.abi-update.xml
 
b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.abi-update.xml
index 7cdc7eec1f..4061a0ae35 100644
--- 
a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.abi-update.xml
+++ 
b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.abi-update.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='yes' name='enrolled-keys'/>
       <feature enabled='yes' name='secure-boot'/>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.args
index 1bdd482d71..e7c9110c95 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.xml
index 79ab55751b..f4df8c07ed 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='yes' name='enrolled-keys'/>
       <feature enabled='yes' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.xml
index e67e3a0844..c93f16e8f4 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader secure='yes'/>
   </os>
   <features>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args
index 1bdd482d71..e7c9110c95 100644
--- 
a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args
+++ 
b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml
index 33134d405f..cfe6c33cec 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='yes' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.xml
index 019faa29b9..b5529a860c 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
     </firmware>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.args
index 0ecac2fda1..cbafadec2c 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -m size=1048576k \
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.xml
index e85b1be965..4699c24bb5 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='no' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.xml
index 7ddeb2d230..8d81ee89a0 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='secure-boot'/>
     </firmware>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.args
index f453e5117d..6fb2c7ffc4 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.xml
index 7f680e9fc5..51b6727f92 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='yes' name='enrolled-keys'/>
       <feature enabled='yes' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.xml
index 4ea37550e0..896eec6b40 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <features>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.x86_64-latest.xml
 
b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.x86_64-latest.xml
index fbb51f1734..5bd8d3e921 100644
--- 
a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.x86_64-latest.xml
+++ 
b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' type='pflash' 
format='raw'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
     <nvram template='/path/to/OVMF_VARS.fd'/>
     <boot dev='hd'/>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.xml
index c225e5ef48..ab23cc122c 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' 
type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
     <nvram template='/path/to/OVMF_VARS.fd'/>
   </os>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.args
index 1bdd482d71..e7c9110c95 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.xml
index 33134d405f..cfe6c33cec 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='yes' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.xml
index 8a91594f4b..1b67c0eab0 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <nvram template='/usr/share/edk2/ovmf/OVMF_VARS.fd'/>
   </os>
   <features>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-latest.xml
index c9bca900af..217c1f4b94 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='no' type='pflash' format='raw'/>
     <boot dev='hd'/>
   </os>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.xml
index 0100585031..edc97bd916 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='no' type='pflash'/>
   </os>
   <features>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.xml
index 4e744b69a3..0f6b965067 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='no' format='raw'/>
     <boot dev='hd'/>
   </os>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-rw.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-rw.xml
index 6bee044058..4db0a7c36c 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-rw.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-rw.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='no'/>
   </os>
   <features>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.args
index 1bdd482d71..e7c9110c95 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.xml
index 79ab55751b..f4df8c07ed 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='yes' name='enrolled-keys'/>
       <feature enabled='yes' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.xml
index b2c18cdd54..0fe9489d19 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='yes' name='secure-boot'/>
     </firmware>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.args
index 23d9ea98ab..42a47fe29e 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,smm=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -m size=1048576k \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.xml
index c36c2b7b9d..011c89d0f2 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='no' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.xml
index 8e3d185efa..6359ec3f0a 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
   </os>
   <features>
     <acpi/>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.args
index 47803b0961..0c0caf2468 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF.amdsev.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--machine 
pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -m size=1048576k \
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.xml
index aa94bb32db..3fead35a66 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='no' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.xml
index 575d756265..3acc433ae8 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader stateless='yes'/>
   </os>
   <features>
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.args 
b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.args
index 2bc7a1b9d5..468ad4326c 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"qcow2","file":"libvirt-pflash0-storage","backing":null}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.qcow2","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"qcow2","file":"libvirt-pflash1-storage","backing":null}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git 
a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.xml
index 7cdc7eec1f..4061a0ae35 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='yes' name='enrolled-keys'/>
       <feature enabled='yes' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args
index 1bdd482d71..e7c9110c95 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.xml
index 79ab55751b..f4df8c07ed 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='yes' name='enrolled-keys'/>
       <feature enabled='yes' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi.xml 
b/tests/qemuxmlconfdata/firmware-auto-efi.xml
index 8bf079a1c7..b20cf23dfa 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
   </os>
   <features>
     <acpi/>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.args
index d2e2f9c0f3..fd560fa9fe 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.xml
index 0a4367ea75..da7455da09 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='no' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.xml
index 369bc3c7c5..96e6110b3f 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' 
type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
     <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.args
 
b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.args
index f702d80818..a77d7fe7fd 100644
--- 
a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.args
+++ 
b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/path/to/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.xml
 
b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.xml
index 783a82336c..c17834b5e6 100644
--- 
a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.xml
+++ 
b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' type='pflash' 
format='raw'>/path/to/OVMF_CODE.fd</loader>
     <nvram template='/path/to/OVMF_VARS.fd' 
format='raw'>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram>
     <boot dev='hd'/>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.xml
index 5a3da3c25b..8c3801ae56 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/path/to/OVMF_CODE.fd</loader>
     <nvram template='/path/to/OVMF_VARS.fd'/>
   </os>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest.args
index 307832a354..07f220db04 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel tcg \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest.xml
index 3465be2eb0..1c92ec5a6e 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='yes' name='enrolled-keys'/>
       <feature enabled='yes' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.xml
index 711a784c52..fbbd03cc43 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' secure='yes' 
type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd</loader>
     <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.args
 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.args
index da5f53f733..1bbba7e99f 100644
--- 
a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.args
+++ 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel tcg \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.xml
 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.xml
index 76a9b62f19..b452ebaca2 100644
--- 
a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.xml
+++ 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' secure='yes' type='pflash' 
format='raw'>/usr/share/OVMF/OVMF_CODE.secboot.fd</loader>
     <nvram template='/usr/share/OVMF/OVMF_VARS.fd' templateFormat='raw' 
format='raw'>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram>
     <boot dev='hd'/>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.xml
index cfc27226b5..71b83099b2 100644
--- 
a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.xml
+++ 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' secure='yes' 
type='pflash'>/usr/share/OVMF/OVMF_CODE.secboot.fd</loader>
     <nvram template='/usr/share/OVMF/OVMF_VARS.fd'/>
   </os>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.args
index 307832a354..07f220db04 100644
--- 
a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.args
+++ 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel tcg \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.xml
index 97515f917e..cffae3f8d7 100644
--- 
a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.xml
+++ 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='yes' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.xml
index 5b215abf12..09853cbd07 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' secure='yes' 
type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd</loader>
     <nvram 
template='/usr/share/edk2/ovmf/OVMF_VARS.fd'>/path/to/guest_VARS.fd</nvram>
   </os>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.args
 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.args
index e35cbd4f16..2113a46e80 100644
--- 
a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.args
+++ 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.xml
 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.xml
index d2d9777284..83623f1de2 100644
--- 
a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.xml
+++ 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' type='pflash' 
format='raw'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram template='/usr/share/OVMF/OVMF_VARS.fd' templateFormat='raw' 
format='raw'>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram>
     <boot dev='hd'/>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.xml
index f85aeb251b..83f94724ab 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram template='/usr/share/OVMF/OVMF_VARS.fd'/>
   </os>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.args
index d2e2f9c0f3..fd560fa9fe 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.xml
index 0a4367ea75..da7455da09 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='no' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.xml
index b51209f3ca..86d4b044d5 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' 
type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
     <nvram 
template='/usr/share/edk2/ovmf/OVMF_VARS.fd'>/path/to/guest_VARS.fd</nvram>
   </os>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-q35.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-q35.xml
index 5654ebe434..4a86dfdaae 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-q35.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-q35.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' 
type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
     <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.args
 
b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.args
index 0ecac2fda1..cbafadec2c 100644
--- 
a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.args
+++ 
b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel kvm \
 -cpu qemu64 \
 -m size=1048576k \
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.xml
 
b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.xml
index 6c83568f62..cbadd0f0c8 100644
--- 
a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.xml
+++ 
b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' type='pflash' 
format='raw'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
     <nvram template='/path/to/OVMF_VARS.fd' 
format='raw'>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram>
     <boot dev='hd'/>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.xml
index ffa7c5f4cd..38fb2908de 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' 
type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
     <nvram template='/path/to/OVMF_VARS.fd'/>
   </os>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.args
index 85495da6f5..f724cca477 100644
--- 
a/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.args
+++ 
b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":false,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--machine 
pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,acpi=on
 \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.xml
index eaf8ce41bb..df2888f357 100644
--- 
a/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.xml
+++ 
b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='no' type='pflash' 
format='raw'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <boot dev='hd'/>
   </os>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.xml
index 2abea51318..3aa9580b35 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='no' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
   </os>
   <features>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.args
index c26daad29f..4e4b7d563d 100644
--- 
a/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.args
+++ 
b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":false,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--machine 
pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,acpi=on
 \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.xml
index 38c515c647..dbe82726cd 100644
--- 
a/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.xml
+++ 
b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='no' type='pflash' 
format='raw'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
     <boot dev='hd'/>
   </os>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.xml
index e0da71db36..16f8185bd2 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='no' 
type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
   </os>
   <features>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.args
 
b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.args
index da5f53f733..1bbba7e99f 100644
--- 
a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.args
+++ 
b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel tcg \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.xml
 
b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.xml
index 10e1450db6..44d200134b 100644
--- 
a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.xml
+++ 
b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' secure='yes' type='pflash' 
format='raw'>/usr/share/OVMF/OVMF_CODE.secboot.fd</loader>
     <nvram template='/usr/share/OVMF/OVMF_VARS.secboot.fd' 
templateFormat='raw' 
format='raw'>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram>
     <boot dev='hd'/>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.xml
index 99f2218645..a6b05002a8 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' secure='yes' 
type='pflash'>/usr/share/OVMF/OVMF_CODE.secboot.fd</loader>
     <nvram template='/usr/share/OVMF/OVMF_VARS.secboot.fd'/>
   </os>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.args
index 307832a354..07f220db04 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -blockdev 
'{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}'
 \
--machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
+-machine 
pc-q35-10.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on
 \
 -accel tcg \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.xml
index 3465be2eb0..1c92ec5a6e 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='yes' name='enrolled-keys'/>
       <feature enabled='yes' name='secure-boot'/>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.xml 
b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.xml
index bd31948e28..0793a5094f 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <loader readonly='yes' secure='yes' 
type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd</loader>
     <nvram 
template='/usr/share/edk2/ovmf/OVMF_VARS.secboot.fd'>/path/to/guest_VARS.fd</nvram>
   </os>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args
index 4dbf350abc..72fa81a9b3 100644
--- a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -name guest=guest,debug-threads=on \
 -S \
 -object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}'
 \
--machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
+-machine pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on 
\
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.xml
index 813ebbe7bb..3ca048848a 100644
--- a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>
diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.xml 
b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.xml
index cd619db5a6..4e422b9565 100644
--- a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
   </os>
   <features>
     <acpi/>
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args 
b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args
index 4112106540..203e91e3c0 100644
--- a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config 
\
 -name guest=guest,debug-threads=on \
 -S \
 -object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}'
 \
--machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off 
\
+-machine 
pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \
diff --git 
a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.xml 
b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.xml
index 13ada385ea..65753ded95 100644
--- a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>
diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.xml 
b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.xml
index a5cfd48a34..cfe2bee93b 100644
--- a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-- 
2.49.0