From: Peter Krempa <pkrempa@redhat.com> 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> --- tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args | 2 +- tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml | 2 +- tests/qemuxmlconfdata/aarch64-virt-graphics.xml | 2 +- .../aarch64-virt-headless-mmio.aarch64-latest.args | 2 +- .../aarch64-virt-headless-mmio.aarch64-latest.xml | 2 +- tests/qemuxmlconfdata/aarch64-virt-headless-mmio.xml | 2 +- tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args | 2 +- tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml | 2 +- tests/qemuxmlconfdata/aarch64-virt-headless.xml | 2 +- .../firmware-auto-efi-aarch64.aarch64-latest.abi-update.args | 2 +- .../firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml | 2 +- .../firmware-auto-efi-aarch64.aarch64-latest.args | 2 +- .../firmware-auto-efi-aarch64.aarch64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-aarch64.xml | 2 +- ...re-auto-efi-format-loader-raw.aarch64-latest.abi-update.args | 2 +- ...are-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml | 2 +- .../firmware-auto-efi-format-loader-raw.aarch64-latest.args | 2 +- .../firmware-auto-efi-format-loader-raw.aarch64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.xml | 2 +- ...firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args | 2 +- .../firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml | 2 +- .../firmware-manual-efi-aarch64-legacy-paths.xml | 2 +- .../firmware-manual-efi-acpi-aarch64.aarch64-latest.args | 2 +- .../firmware-manual-efi-acpi-aarch64.aarch64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.xml | 2 +- .../firmware-manual-efi-noacpi-aarch64.aarch64-latest.args | 2 +- .../firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.xml | 2 +- .../firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args | 2 +- .../firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.xml | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args index 1de153af00..1f1323bb86 100644 --- 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 6f3287d52d..98ecc9ac70 100644 --- 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 4f69df91dc..ecf17ba37e 100644 --- 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 285ef29f25..de491afa07 100644 --- 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 295c14c828..dca548bb8d 100644 --- 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 4f2519bb1f..93a2b07ca4 100644 --- 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 99aad69a93..871806183f 100644 --- 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 0b96654010..48bdebb8c2 100644 --- 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 9c8e75038d..bca54f2818 100644 --- 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 3e20cb4aa5..c8261dd203 100644 --- 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 1a9baa8cc1..36057b44a6 100644 --- 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 7bf2aeb570..c71549c039 100644 --- 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 0ee421fe6f..bc79fe0247 100644 --- 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 5c6c5192ba..68915dbc1b 100644 --- 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 557c7eac56..6779f359b1 100644 --- 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 f95e2d2465..21bbda868b 100644 --- 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 7bf2aeb570..c71549c039 100644 --- 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 0ee421fe6f..bc79fe0247 100644 --- 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 ef4cc6d363..c88e72697b 100644 --- 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 83b1ce46ab..d6dbe40923 100644 --- 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 2e5c4fe584..6052ac1d1b 100644 --- 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 8ab921d344..aa03f766ab 100644 --- 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 0ebadffe99..c22f440ada 100644 --- 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 392601c167..89e55a8bc9 100644 --- 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 66d234829c..e04de1c216 100644 --- 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 a7bb5c9aae..8327643832 100644 --- 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 e8289954e3..d932f916d3 100644 --- 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 433a483be4..c6cfba5121 100644 --- 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 6a9095634e..8106ea2635 100644 --- 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 57ddaf1345..1ec78ed011 100644 --- 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 5deb68d4f3..8015d918fa 100644 --- 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 e96c83550c..05cb906a29 100644 --- 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> -- 2.51.1