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

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 <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/tests/qemuxmlconfdata/firmware-auto-bios-not-stateless.xml b/tests/qemuxmlconfdata/firmware-auto-bios-not-stateless.xml
index a1f21e9bb48384a6b27e0d955797dc49ade53989..47114a2b50939d6cafc816c724c69f1819150638 100644 (file)
--- 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 c87debdb01f68a088d2186ee35f798b1add6a768..094b60336274abe277289d0af5d7cd3f6be7d36e 100644 (file)
--- 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 0efb878bb29f2bec06dc3247732a741b65cafc9a..a6a52e2b52393d64a8cafde513e1cd9cb8467eda 100644 (file)
--- 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 31b83b5593e4a001594337fb4c1ee68968617ec6..547dff5ed3423b42aeba415c3369ef48e9951dc4 100644 (file)
--- 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 540f61a2b863c51f6eb5eea87a836d97a554fff6..6276ac7ef5c6909c5b4009d7c3ce8b4942c0d724 100644 (file)
--- 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 0efb878bb29f2bec06dc3247732a741b65cafc9a..a6a52e2b52393d64a8cafde513e1cd9cb8467eda 100644 (file)
--- 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 d7471baa6120b71e38049d9c4a6370348aa88b3c..ae9c9f56d9b026acec67945516ec8e0a276711c8 100644 (file)
--- 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 1911b40ae78b7a7260ae7186a81289ba0f21872b..92464ca941aecafd2d3361837d3dc5d29a59b018 100644 (file)
--- 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 897da8e1266e6644468d395615e97b1ae02a7eb5..560905dd39893fdfecb80a0ac6f98d43541feefe 100644 (file)
--- 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 1bdd482d71df01f134b0a778fc0dd053344b1d57..e7c9110c95043e4b5eac2b50948495b149278199 100644 (file)
--- 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 79ab55751b3ced704ddf92d461f73e0034a4601d..f4df8c07ed7015ae073d5ca45cc7849bd4ed4fca 100644 (file)
--- 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 01bba19a32e0ae662453ed007608aba1d1e3f090..24470932952dd74cb5b14a30b224b414c5beaf02 100644 (file)
--- 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 2694e0676fc40a69e01ca3e43932cf5a752de615..25b93c8a2e36e3969807bbce0de76002a6f45765 100644 (file)
--- 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 dd044ac091e6da0c6341d406064aa0793c7907ec..70d49c3bb564b11046c25dbd04c7158c76fdaec1 100644 (file)
--- 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 75fa44fd20b3483932eda8ce3283aa870406b516..03794d53c09652605ea4846531e996ceaf175ae3 100644 (file)
--- 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 2bc7a1b9d5376fc76c7850b46923202191506de5..468ad4326cb56588784f7e1e782ebc320ee37acb 100644 (file)
--- 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 7cdc7eec1f2824603970b175e82a8584472fe3d1..4061a0ae35b3da786c8a21b7bc8c94b9d019d2e0 100644 (file)
--- 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 4d4bea8ff8ea26d77046a6bccb86f0df9fd0439c..7a8eeb9ffdec186366b654316a2fe296ea209716 100644 (file)
--- 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 1bdd482d71df01f134b0a778fc0dd053344b1d57..e7c9110c95043e4b5eac2b50948495b149278199 100644 (file)
--- 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 79ab55751b3ced704ddf92d461f73e0034a4601d..f4df8c07ed7015ae073d5ca45cc7849bd4ed4fca 100644 (file)
--- 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 6caec1a94c93c4eccba963668831db4444ed1e42..7c2f01eefbf8a0aa983d814921f98897f15be42a 100644 (file)
--- 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 2694e0676fc40a69e01ca3e43932cf5a752de615..25b93c8a2e36e3969807bbce0de76002a6f45765 100644 (file)
--- 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 dd044ac091e6da0c6341d406064aa0793c7907ec..70d49c3bb564b11046c25dbd04c7158c76fdaec1 100644 (file)
--- 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 fe67aa8edf5b71755686193343ace4c9b2a9032d..4a850e2d25d62b1bab845da70f02af166b702122 100644 (file)
--- 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 2bc7a1b9d5376fc76c7850b46923202191506de5..468ad4326cb56588784f7e1e782ebc320ee37acb 100644 (file)
--- 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 7cdc7eec1f2824603970b175e82a8584472fe3d1..4061a0ae35b3da786c8a21b7bc8c94b9d019d2e0 100644 (file)
--- 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 6da8374ec610e9e6d9cbd0b990e06bfa448da0e7..e5eca098f808b50ec22595366aae3bb6a8edb8e1 100644 (file)
--- 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 0ecac2fda180d820172c1af44ea548b9d08b8736..cbafadec2cf45ec6284d54ff744b4f8093d5bada 100644 (file)
--- 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 28da16a5b4e5fc5d877e4f2e5f04ee78add8a3ac..9d06cf64aa61707b734cd013cb821b0f7694134c 100644 (file)
--- 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 08ddfe3cfec760b2eb64749c57a108565b8610e0..5799448ade7c1dd6f41adee75b5b48f9572d9f8a 100644 (file)
--- 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 1f09253a16cf069b4f60bc69e7cc7ca2158e5500..0b2dcf8386d7348edf1844febfcc19b3a00595cc 100644 (file)
--- 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 daec5989d51f7d262d606a0585433948e38c0a28..67fa58ec4b0789ceb58c4b935fe52953fefe09cc 100644 (file)
--- 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 0ecac2fda180d820172c1af44ea548b9d08b8736..cbafadec2cf45ec6284d54ff744b4f8093d5bada 100644 (file)
--- 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 e85b1be9650c10672ca717a497993ae4cbd0f0b0..4699c24bb5dcc9cd80ebf42e291405a7b2368b41 100644 (file)
--- 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 36bc8f7735cd704cab54ca9e5516395725bce727..6beb1550451e2c383f65accdb30f1661432cc5e1 100644 (file)
--- 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 2bc7a1b9d5376fc76c7850b46923202191506de5..468ad4326cb56588784f7e1e782ebc320ee37acb 100644 (file)
--- 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 7cdc7eec1f2824603970b175e82a8584472fe3d1..4061a0ae35b3da786c8a21b7bc8c94b9d019d2e0 100644 (file)
--- 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 1bdd482d71df01f134b0a778fc0dd053344b1d57..e7c9110c95043e4b5eac2b50948495b149278199 100644 (file)
--- 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 79ab55751b3ced704ddf92d461f73e0034a4601d..f4df8c07ed7015ae073d5ca45cc7849bd4ed4fca 100644 (file)
--- 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 e67e3a084486d519cbc2cb0f46493ab25b8593be..c93f16e8f4d1777762f33d9d5a45000c9d7e6697 100644 (file)
--- 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 1bdd482d71df01f134b0a778fc0dd053344b1d57..e7c9110c95043e4b5eac2b50948495b149278199 100644 (file)
--- 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 33134d405fc15deac689e143a70537f07b29763f..cfe6c33cec2225dff4f1055feb66ac696f02f0db 100644 (file)
--- 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 019faa29b97ae9b2f390becbfd02e5c62ef8eb12..b5529a860cd8936948dde3c0ba307b3acdaba421 100644 (file)
--- 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 0ecac2fda180d820172c1af44ea548b9d08b8736..cbafadec2cf45ec6284d54ff744b4f8093d5bada 100644 (file)
--- 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 e85b1be9650c10672ca717a497993ae4cbd0f0b0..4699c24bb5dcc9cd80ebf42e291405a7b2368b41 100644 (file)
--- 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 7ddeb2d23066a5c655e0976666a3254d318ce093..8d81ee89a025ace632662060d24546b107a9bd88 100644 (file)
--- 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 f453e5117df32f7c656489c68221991bb6a2f022..6fb2c7ffc42305c0554b24dcec36bfdd5574b8f1 100644 (file)
--- 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 7f680e9fc5413d63de173bbc4855e7123b890690..51b6727f92f20382a8fff11e5e641f7742a181c9 100644 (file)
--- 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 4ea37550e00cca2134484f4060af83c80a3c36c4..896eec6b404a057964d946eb998ef056a6c900d0 100644 (file)
--- 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 fbb51f17341fb9334f4e4f50834e52f47c161fec..5bd8d3e921387b20deff55e54c31e38b4b1243b3 100644 (file)
--- 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 c225e5ef48d2ce2cad4e2248a50b85eb67df7f07..ab23cc122c5207f0198c2a0b4e9b9bca3ead1003 100644 (file)
--- 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 1bdd482d71df01f134b0a778fc0dd053344b1d57..e7c9110c95043e4b5eac2b50948495b149278199 100644 (file)
--- 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 33134d405fc15deac689e143a70537f07b29763f..cfe6c33cec2225dff4f1055feb66ac696f02f0db 100644 (file)
--- 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 8a91594f4b1b8c785a4e9103009d8e8310e048f8..1b67c0eab08ead75feb4c565769f0c074139db12 100644 (file)
--- 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 c9bca900af11c2f5842c3afb090776dac54eef7e..217c1f4b943c64ae2fe77154078517533740e59e 100644 (file)
--- 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 0100585031b2e4bcb3d3524c1fed7de947d08e91..edc97bd91662607ca2be392e0440259a6b8c51aa 100644 (file)
--- 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 4e744b69a38572b265af5970bebfd272c88c388e..0f6b9650671e3e41c904812bf1eefc4da3baa381 100644 (file)
--- 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 6bee0440584fc79a0c35d4b9ef0255a436e28bed..4db0a7c36c8675d739e1d85d4229bb4f99805c92 100644 (file)
--- 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 1bdd482d71df01f134b0a778fc0dd053344b1d57..e7c9110c95043e4b5eac2b50948495b149278199 100644 (file)
--- 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 79ab55751b3ced704ddf92d461f73e0034a4601d..f4df8c07ed7015ae073d5ca45cc7849bd4ed4fca 100644 (file)
--- 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 b2c18cdd54d1c289c51c0dc510a12db45002596f..0fe9489d192848b32923d0aebbdad11bf8a5655a 100644 (file)
--- 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 23d9ea98ab22a325b7c37807f7d946830d1b5f3c..42a47fe29e207e07bd00cf4aaa5e05e7e9abf198 100644 (file)
--- 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 c36c2b7b9d40a8f36e1cd425757538db5b4c21db..011c89d0f2f29da73b37509006106966a877554f 100644 (file)
--- 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 8e3d185efa703d495074400a7a1639b1c0b8606a..6359ec3f0ad40a710621ccaa12be4fd6f58ecc78 100644 (file)
--- 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 47803b09617f881f49e7123df27567c5929407ac..0c0caf246861cc8abd5d48219b9a1a1845586c09 100644 (file)
--- 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 aa94bb32db7f980f4b44d3555487f8d4fed56ac1..3fead35a665745689276b5274fb8beaab86c9776 100644 (file)
--- 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 575d7562653460c0e25635f63400c0ac66e4f7b8..3acc433ae88831e751e19851074b6160b5b15ec5 100644 (file)
--- 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 2bc7a1b9d5376fc76c7850b46923202191506de5..468ad4326cb56588784f7e1e782ebc320ee37acb 100644 (file)
--- 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 7cdc7eec1f2824603970b175e82a8584472fe3d1..4061a0ae35b3da786c8a21b7bc8c94b9d019d2e0 100644 (file)
--- 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 1bdd482d71df01f134b0a778fc0dd053344b1d57..e7c9110c95043e4b5eac2b50948495b149278199 100644 (file)
--- 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 79ab55751b3ced704ddf92d461f73e0034a4601d..f4df8c07ed7015ae073d5ca45cc7849bd4ed4fca 100644 (file)
--- 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 8bf079a1c788599edaef8e6bd0f65442f4ba5121..b20cf23dfa972dddeaff709867f7b988b092f96e 100644 (file)
--- 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 d2e2f9c0f3d41106b3a33e4f8b2e89b5cdade32a..fd560fa9fe5fbdf70bf2dff5aa4af23363e2273c 100644 (file)
--- 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 0a4367ea756a55db0ddfcef078954e3a2edb05e4..da7455da09fe847872dddb8adcda7e40346e7513 100644 (file)
--- 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 369bc3c7c56a061640f0b0cdece66c64361dbb2e..96e6110b3f036a6937aa2bd8b5de45e900c437ed 100644 (file)
--- 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 f702d808189b73a94f7afe8999f1f1a07275996e..a77d7fe7fd6a1a2920ca2fe19ca7e036e51edd23 100644 (file)
--- 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 783a82336cda9e65b6e6bba2ccea6490cb83fa99..c17834b5e60b44e65986a0943089edd4818363d1 100644 (file)
--- 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 5a3da3c25b0b77bf2c5b0f894988039156e2cd12..8c3801ae5667f5e72f9311c291bbd7daa2d023c9 100644 (file)
--- 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 307832a3545c0ba74a5af9a73ab8c6b6439bc9ef..07f220db04acabdd690e6924af60edf17735b66d 100644 (file)
--- 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 3465be2eb08a481a5a630245e7cba95e92c020ba..1c92ec5a6e5ce4639ec27389de0d5aa8b5f71a37 100644 (file)
--- 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 711a784c529c9f58fc3d6616200777783f97116c..fbbd03cc431bca310a6f82ca4eb452a520ef7692 100644 (file)
--- 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 da5f53f733fac3e2fd1aff3f050d0e4617fc95ad..1bbba7e99f7050adbf10bd8e40626a2e1470264e 100644 (file)
--- 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 76a9b62f1960dcdea45380b2abf1db4b57cfc141..b452ebaca28c1d7d32cb22da38424b1a5007a99a 100644 (file)
--- 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 cfc27226b5b854feaa88884dd41f6e638929c8e7..71b83099b22429a0f5dbfd34115bbc7d5023934d 100644 (file)
--- 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 307832a3545c0ba74a5af9a73ab8c6b6439bc9ef..07f220db04acabdd690e6924af60edf17735b66d 100644 (file)
--- 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 97515f917eaf85a8c9ca5705d36cb35ae1e615ec..cffae3f8d74a43f9c51bdbda24b1a4c364d3d63d 100644 (file)
--- 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 5b215abf12fbee8887d086bd2532ef83e1be3ebe..09853cbd0725156e68f961c121c6cf447d841f40 100644 (file)
--- 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 e35cbd4f16304fca85fbf250e846a8722fec5a07..2113a46e80d9223e2f9bc3aed655053b6eb4a2db 100644 (file)
--- 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 d2d9777284e04bb1c5adcfd074064b7703ccd77f..83623f1de2f4dc9a2fdd2c1a9041d6bb9d96ef7b 100644 (file)
--- 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 f85aeb251b0b26fc76d40b0642dc63a014345683..83f94724ab4e25f4016bb53ed3f4cf58f2b8bcfc 100644 (file)
--- 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 d2e2f9c0f3d41106b3a33e4f8b2e89b5cdade32a..fd560fa9fe5fbdf70bf2dff5aa4af23363e2273c 100644 (file)
--- 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 0a4367ea756a55db0ddfcef078954e3a2edb05e4..da7455da09fe847872dddb8adcda7e40346e7513 100644 (file)
--- 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 b51209f3cad6afcbdc4ef15ff5af3d6276d64908..86d4b044d55e91d39e61233329b742a37c4e790b 100644 (file)
--- 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 5654ebe4347da01ce270790d0abcea266ef0e20e..4a86dfdaae8dbd5e4017f9ddb1167b0d3e4f7373 100644 (file)
--- 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 0ecac2fda180d820172c1af44ea548b9d08b8736..cbafadec2cf45ec6284d54ff744b4f8093d5bada 100644 (file)
--- 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 6c83568f62a96a885a6281f5eefa9d40caeab054..cbadd0f0c8cb125b5d0518a4aa1809d60c9a4318 100644 (file)
--- 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 ffa7c5f4cd94c9d837f0a40afa1b0b782f8216e4..38fb2908de17115d7e3afbcbb22db446647f9569 100644 (file)
--- 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 85495da6f5df485ab7df67a82caae683d505a59f..f724cca47791124025b6c640ab80b09b93c13841 100644 (file)
--- 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 eaf8ce41bb6cb456ecf532b42c1814bb472dadde..df2888f35714280088c37c0f833e07af435c70c5 100644 (file)
--- 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 2abea513183004cea689c76527fec81759358d9e..3aa9580b3585843cd3ea72c01f79146ab68573ac 100644 (file)
--- 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 c26daad29fb1538b156f01fefbd6f0c4ddcce2e2..4e4b7d563d4c4506eca10ec9e6abccdf95fa9c97 100644 (file)
--- 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 38c515c6478581994cbce128318acb79b027326f..dbe82726cd0768ffadba1c888114d6e873c277df 100644 (file)
--- 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 e0da71db3631effb89579eaa8dfbf867449fea8a..16f8185bd2c3958e3b11ac12697b2b911dcf3ebf 100644 (file)
--- 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 da5f53f733fac3e2fd1aff3f050d0e4617fc95ad..1bbba7e99f7050adbf10bd8e40626a2e1470264e 100644 (file)
--- 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 10e1450db6c240cd349651a92a652d77a154b054..44d200134bd7701f44667fcbdb2f80afe65de744 100644 (file)
--- 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 99f221864527aae06cd8329feb0a5f685387460f..a6b05002a88ae93e1c52f4a58c8653d41f395fca 100644 (file)
--- 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 307832a3545c0ba74a5af9a73ab8c6b6439bc9ef..07f220db04acabdd690e6924af60edf17735b66d 100644 (file)
--- 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 3465be2eb08a481a5a630245e7cba95e92c020ba..1c92ec5a6e5ce4639ec27389de0d5aa8b5f71a37 100644 (file)
--- 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 bd31948e2812ec40bfa27dd82c946122610c5dc8..0793a5094faa747dafd444be43d6240542df382d 100644 (file)
--- 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 4dbf350abc933090f57470a7a42d696e517fd914..72fa81a9b39db6538962e3bd63a703cf7d239761 100644 (file)
--- 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 813ebbe7bbd18b45a31b64e21a79670b2d88780e..3ca048848a176cbdf1df643f7dcb02ec4634a7d3 100644 (file)
--- 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 cd619db5a635362116046379ce11f5b9c8b52d2a..4e422b9565f505da98af60161407f6b50fae1ecb 100644 (file)
--- 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 41121065401a08c53c5943d56b8611afdb1887cb..203e91e3c00fc23792800d2e62f4656e4aefaa0f 100644 (file)
--- 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 13ada385eaf4a53772c0f211f965a163fe643791..65753ded957c958c351a566dcb5ff93f69b9a501 100644 (file)
--- 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 a5cfd48a347ef964a757206f23b4a5e36e4b997f..cfe2bee93bc40ccae17b2fd428ccf0030472f7c7 100644 (file)
--- 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>