From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 4 Jul 2025 07:55:14 +0000 (+0200)
Subject: qemuxmlconftest: x86_64: Bump 'firmware*' test cases to 'pc-i440fx-10.0'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=974ec08cb91c6ec8f622cfaaf8a5902daa737a72;p=thirdparty%2Flibvirt.git

qemuxmlconftest: x86_64: Bump 'firmware*' test cases to 'pc-i440fx-10.0'

New qemu is deprecating 'pc-i440fx-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 'pc' 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 <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.args
index e8e6157f67..046aeb77cd 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.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":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"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-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on \
+-machine pc-i440fx-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.xml
index cc87905306..36597d2e8d 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.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-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='secure-boot'/>
     </firmware>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.xml
index d604840edd..2c9b93a7d0 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <nvram type='network' format='qcow2'>
       <source protocol='nbd'>
         <host name='example.org' port='6000'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.args
index 42e075b1b6..0cb780853a 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.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-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
+-machine pc-i440fx-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-auto-efi-nvram-file.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.xml
index dac07adb3e..d864a3b081 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.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-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-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-nvram-file.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.xml
index 8353cc3e82..d266741c2d 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <nvram type='file'>
       <source file='/path/to/guest_VARS.fd'/>
     </nvram>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.args
index 8a85bbacce..026155edff 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.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":"raw","file":"libvirt-pflash0-storage"}' \
 -object '{"qom-type":"secret","id":"libvirt-pflash1-storage-auth-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}' \
 -blockdev '{"driver":"iscsi","portal":"example.com:6000","target":"iqn.2013-07.com.example:iscsi-nopool","lun":0,"transport":"tcp","user":"myname","password-secret":"libvirt-pflash1-storage-auth-secret0","node-name":"libvirt-pflash1-storage","read-only":false}' \
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
+-machine pc-i440fx-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-auto-efi-nvram-network-iscsi.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.xml
index b21932d1b8..bdfc7b9589 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.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-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='secure-boot'/>
     </firmware>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.xml
index c709f3e319..eda014fa14 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <nvram type='network'>
       <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool'>
         <host name='example.com' port='6000'/>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-latest.args
index 086bfa1ee2..2999e321d7 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.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":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"export":"bar","node-name":"libvirt-pflash1-storage","read-only":false}' \
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
+-machine pc-i440fx-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-auto-efi-nvram-network-nbd.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-latest.xml
index 6418ff6c3c..2bc72e6c2b 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.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-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='secure-boot'/>
     </firmware>
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.xml
index 2a46819ef2..cbd2e550b4 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <nvram type='network'>
       <source protocol='nbd' name='bar'>
         <host name='example.org' port='6000'/>
diff --git a/tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.xml b/tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.xml
index 8581e941f0..f1ad86de96 100644
--- a/tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <loader stateless='no'>/usr/share/seabios/bios.bin</loader>
   </os>
   <devices>
diff --git a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.args
index effbdbe769..969c7ad68c 100644
--- a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-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-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc-i440fx-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
 -cpu qemu64 \
 -bios /usr/share/seabios/bios.bin \
diff --git a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.xml
index 4f7bd872f6..dc641ff9f6 100644
--- a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.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-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <loader type='rom' stateless='yes' format='raw'>/usr/share/seabios/bios.bin</loader>
     <boot dev='hd'/>
   </os>
diff --git a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.xml b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.xml
index 0d20ad256f..8f37e7a577 100644
--- a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <loader stateless='yes'>/usr/share/seabios/bios.bin</loader>
   </os>
   <devices>
diff --git a/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args
index effbdbe769..969c7ad68c 100644
--- a/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-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-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc-i440fx-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
 -cpu qemu64 \
 -bios /usr/share/seabios/bios.bin \
diff --git a/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.xml
index 040c31b5b9..7c06d8e8b8 100644
--- a/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-bios.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-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <loader type='rom' format='raw'>/usr/share/seabios/bios.bin</loader>
     <boot dev='hd'/>
   </os>
diff --git a/tests/qemuxmlconfdata/firmware-manual-bios.xml b/tests/qemuxmlconfdata/firmware-manual-bios.xml
index 0749f94c40..eeb8cc3ac0 100644
--- a/tests/qemuxmlconfdata/firmware-manual-bios.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-bios.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <loader>/usr/share/seabios/bios.bin</loader>
   </os>
   <devices>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.args
index 90f8b15b9b..d8a1abd7ff 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-features.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-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
+-machine pc-i440fx-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-features.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.xml
index 5f958ec758..fe02122f98 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-features.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-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-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-features.xml b/tests/qemuxmlconfdata/firmware-manual-efi-features.xml
index 7dbef3acae..cb52bc02b0 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-features.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-features.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
     </firmware>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-loader-no-path.xml b/tests/qemuxmlconfdata/firmware-manual-efi-loader-no-path.xml
index 66ad0804ae..f393a9fcab 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-no-path.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-no-path.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <loader readonly='yes' type='pflash'/>
   </os>
   <features>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.args
index 42e075b1b6..0cb780853a 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.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-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
+-machine pc-i440fx-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-nvram-file.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.xml
index dac07adb3e..d864a3b081 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.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-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-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-nvram-file.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.xml
index 69c4427fcf..3c06fd06e2 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
     <nvram type='file'>
       <source file='/path/to/guest_VARS.fd'/>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args
index 8a85bbacce..026155edff 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.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":"raw","file":"libvirt-pflash0-storage"}' \
 -object '{"qom-type":"secret","id":"libvirt-pflash1-storage-auth-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}' \
 -blockdev '{"driver":"iscsi","portal":"example.com:6000","target":"iqn.2013-07.com.example:iscsi-nopool","lun":0,"transport":"tcp","user":"myname","password-secret":"libvirt-pflash1-storage-auth-secret0","node-name":"libvirt-pflash1-storage","read-only":false}' \
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
+-machine pc-i440fx-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-nvram-network-iscsi.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml
index b21932d1b8..bdfc7b9589 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.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-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='secure-boot'/>
     </firmware>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.xml
index e1483d404a..0b8cea840d 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
     <nvram type='network'>
       <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool'>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args
index 086bfa1ee2..2999e321d7 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.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":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"export":"bar","node-name":"libvirt-pflash1-storage","read-only":false}' \
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
+-machine pc-i440fx-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-nvram-network-nbd.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml
index 6418ff6c3c..2bc72e6c2b 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.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-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='secure-boot'/>
     </firmware>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.xml
index 3064441720..7129c0d906 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
     <nvram type='network'>
       <source protocol='nbd' name='bar'>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-stateless.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-stateless.xml
index b352cfa341..2506d51b12 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-stateless.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-stateless.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <loader stateless='yes' readonly='yes' type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
     <nvram type='file'>
       <source file='/path/to/guest_VARS.fd'/>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-stateless.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-stateless.xml
index e0970b3341..3524096e0c 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-stateless.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-stateless.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <loader stateless='yes' readonly='yes' type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
     <nvram template="/usr/share/edk2/ovmf/OVMF_VARS.fd"/>
   </os>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-latest.args
index 90f8b15b9b..d8a1abd7ff 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-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.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-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
+-machine pc-i440fx-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-nvram-template.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-latest.xml
index 5f958ec758..fe02122f98 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-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-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-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-nvram-template.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.xml
index 73d310a7eb..f02da7cafc 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-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"/>
   </os>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.args
index f1e136dda0..962ce5525b 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.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":"/path/to/guest_BOTH.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-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,acpi=on \
+-machine pc-i440fx-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-implicit.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.xml
index 919c9030f0..3119121aa9 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.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-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <loader type='pflash' format='raw'>/path/to/guest_BOTH.fd</loader>
     <boot dev='hd'/>
   </os>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.xml b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.xml
index 87fd1317f4..6b54b30d59 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <loader type='pflash'>/path/to/guest_BOTH.fd</loader>
   </os>
   <features>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args
index f1e136dda0..962ce5525b 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw.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":"/path/to/guest_BOTH.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-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,acpi=on \
+-machine pc-i440fx-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.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.xml
index 5ffac0e811..6133687a8e 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw.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-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <loader readonly='no' type='pflash' format='raw'>/path/to/guest_BOTH.fd</loader>
     <boot dev='hd'/>
   </os>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw.xml b/tests/qemuxmlconfdata/firmware-manual-efi-rw.xml
index c98480c119..538308af2e 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-rw.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <loader readonly='no' type='pflash'>/path/to/guest_BOTH.fd</loader>
   </os>
   <features>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.args
index 6a6146b1bc..ff30beeb35 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-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_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"}' \
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,acpi=on \
+-machine pc-i440fx-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-stateless.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.xml
index f55f17b09a..f634b33eb0 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.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-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <loader readonly='yes' type='pflash' stateless='yes' format='raw'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
     <boot dev='hd'/>
   </os>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-stateless.xml b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.xml
index 55c0049c34..4c258b2015 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-stateless.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
     <loader readonly='yes' type='pflash' stateless='yes'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
   </os>
   <features>
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args
index 42e075b1b6..0cb780853a 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-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.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-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
+-machine pc-i440fx-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.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.xml
index 7c92aeb391..24e482298a 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-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-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-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.xml b/tests/qemuxmlconfdata/firmware-manual-efi.xml
index b42f927684..6cba2119a2 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-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>