qemuxmlconftest: Update 'aarch64' tests using 'virt-4.0' machine type

In the upcoming qemu-10.2 release the 'virt-4.0' machine type will be
removed. Update all existing tests which use it to 'virt-10.0' which is
currently present in our caps dump.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args
index 1de153af0026b975010375d5ce48cd9f0006e9c3..1f1323bb869919793914a472e489af133e0a5314 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","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.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \
--machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
+-machine virt-10.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
 -accel tcg \
 -cpu cortex-a15 \
 -m size=4194304k \

diff --git a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml
index 6f3287d52dc4860eeb4ca97a195b99e070147b16..98ecc9ac70abfd20a99b0e0535443bae58ddeaa0 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml
@@ -10,7 +10,7 @@
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static'>4</vcpu>
   <os firmware='efi'>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='no' name='secure-boot'/>

diff --git a/tests/qemuxmlconfdata/aarch64-virt-graphics.xml b/tests/qemuxmlconfdata/aarch64-virt-graphics.xml
index 4f69df91dc9cb20678e0c49f98279609c888670d..ecf17ba37ea287fbe9a59020c40286b178a0013f 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-virt-graphics.xml
+++ b/tests/qemuxmlconfdata/aarch64-virt-graphics.xml
@@ -10,7 +10,7 @@
   <currentMemory>4194304</currentMemory>
   <vcpu>4</vcpu>
   <os>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-10.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw</loader>
     <nvram>/path/to/guest_VARS.raw</nvram>
     <boot dev='hd'/>

diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args
index 285ef29f25cf21717b303f686b709459177b2d82..de491afa074338ba2ebda13ebbabec04c5c9e7b6 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","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.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \
--machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
+-machine virt-10.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
 -accel tcg \
 -cpu cortex-a15 \
 -m size=4194304k \

diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.xml
index 295c14c828d5c8dc150e45a2a719d12458d1486e..dca548bb8d57d01a3d6c4027504bb12f20d00653 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.xml
@@ -10,7 +10,7 @@
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static'>4</vcpu>
   <os firmware='efi'>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='no' name='secure-boot'/>

diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.xml b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.xml
index 4f2519bb1f68f0a299d502e3089cc50516119b64..93a2b07ca4480acdcf0843c4ce4cd2558af81aaa 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.xml
+++ b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.xml
@@ -10,7 +10,7 @@
   <currentMemory>4194304</currentMemory>
   <vcpu>4</vcpu>
   <os>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-10.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw</loader>
     <nvram>/path/to/guest_VARS.raw</nvram>
     <boot dev='hd'/>

diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args
index 99aad69a93d2d9d33241dcfdb837af3e71441b1b..871806183f6bf29dd8fae9e90e64e207cac481bf 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","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.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \
--machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
+-machine virt-10.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
 -accel tcg \
 -cpu cortex-a15 \
 -m size=4194304k \

diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml
index 0b96654010eb95679b603ecabaaf5720d63fbcfa..48bdebb8c213471ce7c2fff55f35df6268127835 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml
@@ -10,7 +10,7 @@
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static'>4</vcpu>
   <os firmware='efi'>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='no' name='secure-boot'/>

diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless.xml b/tests/qemuxmlconfdata/aarch64-virt-headless.xml
index 9c8e75038d9be984f0d035f757eb3a854b74d11c..bca54f281834fc67f7951d424fdd96f39e25588d 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-virt-headless.xml
+++ b/tests/qemuxmlconfdata/aarch64-virt-headless.xml
@@ -10,7 +10,7 @@
   <currentMemory>4194304</currentMemory>
   <vcpu>4</vcpu>
   <os>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-10.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw</loader>
     <nvram>/path/to/guest_VARS.raw</nvram>
     <boot dev='hd'/>

diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.args
index 3e20cb4aa57ed1320f4bff401319e6098a19c041..c8261dd2031efbc4218cc6dbc6bae74edae20749 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-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 virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on \
+-machine virt-10.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on \
 -accel tcg \
 -cpu cortex-a15 \
 -m size=1048576k \

diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml
index 1a9baa8cc13a58559d825fe1a4c9e25856f8ef5e..36057b44a6161a3084ef7cd57a2eb061186ff537 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-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-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args
index 7bf2aeb5701139f9135c7e3f809c48bfcd7f8853..c71549c03976cf20c2716fbb7e317cb54e17e063 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","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 virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
+-machine virt-10.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
 -accel tcg \
 -cpu cortex-a15 \
 -m size=1048576k \

diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.xml
index 0ee421fe6f67c3096d1acb7cbeec7b19775e3bde..bc79fe0247467f837029b4308ee280ae5d48c979 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-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-aarch64.xml b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.xml
index 5c6c5192bafedbc9f9253af6368d3455e5013990..68915dbc1b0dcdae1455a70381444bef62dcdd47 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-10.0'>hvm</type>
   </os>
   <features>
     <acpi/>

diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args
index 557c7eac56505a5c03a9dd15c1f99abb8c692a2a..6779f359b1007ff53ceea6165b36d40237ebd248 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","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.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \
--machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
+-machine virt-10.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
 -accel tcg \
 -cpu cortex-a15 \
 -m size=1048576k \

diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml
index f95e2d2465a2783bfe7d7b65d29b65b94b439435..21bbda868b5d9fed98ff4a71b9c80769fb4e4c89 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-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-format-loader-raw.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args
index 7bf2aeb5701139f9135c7e3f809c48bfcd7f8853..c71549c03976cf20c2716fbb7e317cb54e17e063 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","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 virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
+-machine virt-10.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
 -accel tcg \
 -cpu cortex-a15 \
 -m size=1048576k \

diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.xml
index 0ee421fe6f67c3096d1acb7cbeec7b19775e3bde..bc79fe0247467f837029b4308ee280ae5d48c979 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-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-format-loader-raw.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.xml
index ef4cc6d363c3c23e0f2840ea5e0abf927c306076..c88e72697bfa2255e28fb3e3f60345d5fa38eeb7 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.xml
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-10.0'>hvm</type>
     <loader format='raw'/>
   </os>
   <features>

diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args
index 83b1ce46abfa5f989b567ae3b113cd42fa160998..d6dbe4092365bf1ecbecf722df8f5360a421813a 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_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 virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
+-machine virt-10.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
 -accel tcg \
 -cpu cortex-a15 \
 -m size=1048576k \

diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml
index 2e5c4fe584350d31ebb5143148266f57b5a85174..6052ac1d1b0eb85726edc0b5279b9106d71f9860 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-10.0'>hvm</type>
     <loader readonly='yes' type='pflash' format='raw'>/usr/share/AAVMF/AAVMF_CODE.fd</loader>
     <nvram template='/usr/share/AAVMF/AAVMF_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-aarch64-legacy-paths.xml b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.xml
index 8ab921d34409eeeecc741d5fba8fc198df397fb2..aa03f766abdd2671e18765cf0295d8a6459b5221 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-10.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader>
     <nvram template='/usr/share/AAVMF/AAVMF_VARS.fd'/>
   </os>

diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args
index 0ebadffe9929b1678c07408ace7c1848b995518e..c22f440adab3b30b49a3f000c17a01a960c3474f 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","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.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \
--machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
+-machine virt-10.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \
 -accel tcg \
 -cpu cortex-a15 \
 -m size=1048576k \

diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.xml
index 392601c1670d712c87d0775d4598fe09a45e91f4..89e55a8bc9c95ff68157f45e79c4bbd11ee313c5 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-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-aarch64.xml b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.xml
index 66d234829c879de3b5d903024511d8e2d2f7488b..e04de1c2167747c290e012814d4ebf6df1e9e309 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-10.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw</loader>
     <nvram>/path/to/guest_VARS.raw</nvram>
   </os>

diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args
index a7bb5c9aae00bf97672af89c2d2779a87eeb6293..832764383236ea6e4ed6c480a1fa8714f26d3ebe 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","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.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \
--machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=off \
+-machine virt-10.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=off \
 -accel tcg \
 -cpu cortex-a15 \
 -m size=1048576k \

diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml
index e8289954e347e58e298fd3f30da7cf3c4712f29c..d932f916d3c680e34947213bd9bcc4e967a58b90 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-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-noacpi-aarch64.xml b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.xml
index 433a483be4e3c2a78c95ee4121d14731e56bd50f..c6cfba5121ba9a758e2f21ca92da135453ee8f25 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-10.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw</loader>
     <nvram>/path/to/guest_VARS.raw</nvram>
   </os>

diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.xml b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.xml
index 6a9095634e744122b425022a0c6b89824473faf2..8106ea26350aaa98a514df0e57667be41efa0b5a 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-10.0'>hvm</type>
   </os>
   <features>
     <acpi/>

diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args
index 57ddaf134554421a0ba2bd8c6d0e963d746cb297..1ec78ed011f054ae18029d7ddc9a2dc74b7bf85d 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-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 virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \
+-machine virt-10.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \
 -accel tcg \
 -cpu cortex-a15 \
 -m size=1048576k \

diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml
index 5deb68d4f359d19742bbae40efad43d353f1918c..8015d918fa07ecfbce85ac1e0a888a2d2d4c9ac8 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-10.0'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.xml b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.xml
index e96c83550c0bfcb1c0451e092ad9ca6ccb80c668..05cb906a29ae4859130e76b4b28a1db9caba3dce 100644 (file)
--- a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.xml
+++ b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='virt-4.0'>hvm</type>
+    <type arch='aarch64' machine='virt-10.0'>hvm</type>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>