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 e8e6157f67590b78b329226b17b8629f4add45ff..046aeb77cd375ae06bf82268e28cdeafc86f700e 100644 (file)
--- 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 cc87905306f43db049de12eb23e2e95452b136f1..36597d2e8d489cd1c74af83ee6e15741ca023a65 100644 (file)
--- 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 d604840edd87b2fdbef1e68433982bc0b3eac986..2c9b93a7d09029ec3f51f10ee22aef2a9aa4d2c1 100644 (file)
--- 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 42e075b1b65fa9de7146ad210811371e4362df5b..0cb780853a65461713050c402b5fb9fc2cb1df13 100644 (file)
--- 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 dac07adb3ea7c63d88c613433bb57c7019a82220..d864a3b081b0f49d9d676277dedd6ffdaca428af 100644 (file)
--- 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 8353cc3e8230b612bfb9a63b315b38beb0db8b4f..d266741c2d5496e0128bea498666bae909752cbc 100644 (file)
--- 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 8a85bbacceef6a4183e52519033c71dd1a3d4b73..026155edff506c9c5363f4a39125ba6c189747ec 100644 (file)
--- 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 b21932d1b8979bfda87e4fbd5e23f7e32fe9180b..bdfc7b9589d0235e828ff7b83ec6cea8ecfd9cac 100644 (file)
--- 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 c709f3e319f1f74b3d39acc06be8c1bcd0b7960c..eda014fa143e4440b85dee4c8e9efa6b682ac4ce 100644 (file)
--- 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 086bfa1ee2afb32581770eb35a1c86e9216c5d93..2999e321d77fd7073124071eaf04306f397f7403 100644 (file)
--- 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 6418ff6c3c67d46509fc6f61696bca49db61b8f2..2bc72e6c2befc70b591d71073757ebdee57013cd 100644 (file)
--- 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 2a46819ef22da665321f06ad88b873c01ecf2336..cbd2e550b4a98e687ca4be727a0ed61b92d52aa6 100644 (file)
--- 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 8581e941f02aa87496e885bf7260e39ce29a967d..f1ad86de968f4f0d5154c8688db3cda83d4f0dd6 100644 (file)
--- 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 effbdbe769101fc0c47b0b44b7f1d62547212694..969c7ad68c982ca7398d810ad325c668dd4fe093 100644 (file)
--- 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 4f7bd872f6fa79e9243ec9f32e73ddd4f30e510e..dc641ff9f6d7245f5d73d43e4584ccd3ae7c52f6 100644 (file)
--- 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 0d20ad256fcdaae9cdd42c1ca8efe1faea9ead24..8f37e7a577425f43c5cff71422e95ed48521794e 100644 (file)
--- 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 effbdbe769101fc0c47b0b44b7f1d62547212694..969c7ad68c982ca7398d810ad325c668dd4fe093 100644 (file)
--- 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 040c31b5b989ef8b66d6ab41aba36ef6e1a5c19f..7c06d8e8b81d6ea386d4a076c6244569daf6f718 100644 (file)
--- 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 0749f94c40c355482aeabab6fb0936d9e14bc02c..eeb8cc3ac04e114d954ee1eb82987137dfee4458 100644 (file)
--- 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 90f8b15b9bc9e5dca494bb195b15b76937a063de..d8a1abd7ff212a2c84c9d96524ba4f53562138a2 100644 (file)
--- 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 5f958ec758f09a2bc44f3030baf6d9f6d4193586..fe02122f98359a5b2beb45db319c602e0054ad02 100644 (file)
--- 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 7dbef3acae00ab21326c25f78b51bef5e56a6553..cb52bc02b009d3064daaac535ed8181b58133fdf 100644 (file)
--- 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 66ad0804aeb418dc1b03975954f64fa4671f55b9..f393a9fcab29c76f76eb3d89f5cf1535ac989b76 100644 (file)
--- 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 42e075b1b65fa9de7146ad210811371e4362df5b..0cb780853a65461713050c402b5fb9fc2cb1df13 100644 (file)
--- 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 dac07adb3ea7c63d88c613433bb57c7019a82220..d864a3b081b0f49d9d676277dedd6ffdaca428af 100644 (file)
--- 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 69c4427fcf6ac32ad36a260d05cde414de285c2a..3c06fd06e24da725f0421b64b98cea0485311911 100644 (file)
--- 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 8a85bbacceef6a4183e52519033c71dd1a3d4b73..026155edff506c9c5363f4a39125ba6c189747ec 100644 (file)
--- 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 b21932d1b8979bfda87e4fbd5e23f7e32fe9180b..bdfc7b9589d0235e828ff7b83ec6cea8ecfd9cac 100644 (file)
--- 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 e1483d404a5aebfd6b9ef2ccf4c0f2c34e5c2a24..0b8cea840d681da185ec85a673bcf3d707f45d42 100644 (file)
--- 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 086bfa1ee2afb32581770eb35a1c86e9216c5d93..2999e321d77fd7073124071eaf04306f397f7403 100644 (file)
--- 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 6418ff6c3c67d46509fc6f61696bca49db61b8f2..2bc72e6c2befc70b591d71073757ebdee57013cd 100644 (file)
--- 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 3064441720bb66b95484ad5b0f460b6a03dabd6b..7129c0d90699a149f77a81d5103518f0c5422fbc 100644 (file)
--- 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 b352cfa3413712b7059225335d4a12ff991634a0..2506d51b124a439fae46e379c052055274a123e1 100644 (file)
--- 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 e0970b33418c861cd975a072b9e544f2554a5aaf..3524096e0c09fdd5ba24936b4b21637bff19936c 100644 (file)
--- 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 90f8b15b9bc9e5dca494bb195b15b76937a063de..d8a1abd7ff212a2c84c9d96524ba4f53562138a2 100644 (file)
--- 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 5f958ec758f09a2bc44f3030baf6d9f6d4193586..fe02122f98359a5b2beb45db319c602e0054ad02 100644 (file)
--- 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 73d310a7eba3dced3165c278e154bcd2dccf92e5..f02da7cafc0098ff3383eb714a192e59aab96828 100644 (file)
--- 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 f1e136dda06d6b7972caa8f384deac0d4e946b93..962ce5525bb45ca33e39b0d9de0d3783f9cefba7 100644 (file)
--- 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 919c9030f04cf35d5ee7139ed4e5a88ed98296a4..3119121aa91df29ccdb28d1482f037120999a049 100644 (file)
--- 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 87fd1317f4a04e6040f0fb7d9434b910975bb2be..6b54b30d59e4f36f27d846a57e853f2110dc292a 100644 (file)
--- 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 f1e136dda06d6b7972caa8f384deac0d4e946b93..962ce5525bb45ca33e39b0d9de0d3783f9cefba7 100644 (file)
--- 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 5ffac0e811d0361ea8efc05cbb891dc873578d40..6133687a8e47b76e660ec424624dd8a3826c5e62 100644 (file)
--- 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 c98480c119a17550c93f57215ee51b0e551555a7..538308af2eb8481d2cf1f85bef03ef7a8ce34481 100644 (file)
--- 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 6a6146b1bc42909258be49cebcb732ccf64a79b6..ff30beeb35bec73ec9b2727e42513831f2ba88b1 100644 (file)
--- 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 f55f17b09aec56a525bb24ba6c62c76df500a2b4..f634b33eb0b4c48b7616575af06dc319080724c4 100644 (file)
--- 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 55c0049c34e95e826950884492b32c1a28cb2435..4c258b2015f01f6a04a5abeee73d314fb4a68003 100644 (file)
--- 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 42e075b1b65fa9de7146ad210811371e4362df5b..0cb780853a65461713050c402b5fb9fc2cb1df13 100644 (file)
--- 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 7c92aeb391883d25ef44d45f84d1553718e28e17..24e482298a9384c2730440f9efe5a18ff2148973 100644 (file)
--- 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 b42f927684b834f73bc0dd0e6913977d6e65dc0c..6cba2119a26db3bbe4f5bea7c8eb152c28ec36e6 100644 (file)
--- 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>