mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-11 04:15:49 +00:00
tests: Switch to firmware autoselection for hvf
Firmware selection is not relevant to these tests, so adopt the most convenient approach. Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
751b0e6dbf
commit
8c326914d8
@ -10,11 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
|
|||||||
-name guest=test,debug-threads=on \
|
-name guest=test,debug-threads=on \
|
||||||
-S \
|
-S \
|
||||||
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \
|
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \
|
||||||
-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 '{"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 '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
|
||||||
-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
|
-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/test_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
|
||||||
-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
|
-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
|
||||||
-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
|
-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 \
|
||||||
-accel hvf \
|
-accel hvf \
|
||||||
-m size=4194304k \
|
-m size=4194304k \
|
||||||
-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294967296}' \
|
-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294967296}' \
|
||||||
|
@ -4,10 +4,8 @@
|
|||||||
<memory unit='KiB'>4194304</memory>
|
<memory unit='KiB'>4194304</memory>
|
||||||
<currentMemory unit='KiB'>4194304</currentMemory>
|
<currentMemory unit='KiB'>4194304</currentMemory>
|
||||||
<vcpu placement='static'>2</vcpu>
|
<vcpu placement='static'>2</vcpu>
|
||||||
<os>
|
<os firmware='efi'>
|
||||||
<type arch='aarch64' machine='virt'>hvm</type>
|
<type arch='aarch64' machine='virt-4.0'>hvm</type>
|
||||||
<loader readonly='yes' type='pflash'>/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw</loader>
|
|
||||||
<nvram>/some/user/nvram/path/guest_VARS.fd</nvram>
|
|
||||||
<boot dev='hd'/>
|
<boot dev='hd'/>
|
||||||
</os>
|
</os>
|
||||||
<features>
|
<features>
|
||||||
|
@ -10,9 +10,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
|
|||||||
-name guest=test,debug-threads=on \
|
-name guest=test,debug-threads=on \
|
||||||
-S \
|
-S \
|
||||||
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \
|
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \
|
||||||
-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \
|
-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/test_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
|
||||||
|
-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
|
||||||
|
-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 \
|
||||||
-accel hvf \
|
-accel hvf \
|
||||||
-cpu qemu64 \
|
-cpu qemu64 \
|
||||||
|
-global driver=cfi.pflash01,property=secure,value=on \
|
||||||
-m size=4194304k \
|
-m size=4194304k \
|
||||||
-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}' \
|
-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}' \
|
||||||
-overcommit mem-lock=off \
|
-overcommit mem-lock=off \
|
||||||
|
@ -4,8 +4,8 @@
|
|||||||
<memory unit='KiB'>4194304</memory>
|
<memory unit='KiB'>4194304</memory>
|
||||||
<currentMemory unit='KiB'>4194304</currentMemory>
|
<currentMemory unit='KiB'>4194304</currentMemory>
|
||||||
<vcpu placement='static'>2</vcpu>
|
<vcpu placement='static'>2</vcpu>
|
||||||
<os>
|
<os firmware='efi'>
|
||||||
<type arch='x86_64' machine='q35'>hvm</type>
|
<type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
|
||||||
<boot dev='hd'/>
|
<boot dev='hd'/>
|
||||||
</os>
|
</os>
|
||||||
<features>
|
<features>
|
||||||
|
@ -4,10 +4,14 @@
|
|||||||
<memory unit='KiB'>4194304</memory>
|
<memory unit='KiB'>4194304</memory>
|
||||||
<currentMemory unit='KiB'>4194304</currentMemory>
|
<currentMemory unit='KiB'>4194304</currentMemory>
|
||||||
<vcpu placement='static'>2</vcpu>
|
<vcpu placement='static'>2</vcpu>
|
||||||
<os>
|
<os firmware='efi'>
|
||||||
<type arch='aarch64' machine='virt'>hvm</type>
|
<type arch='aarch64' machine='virt-4.0'>hvm</type>
|
||||||
<loader readonly='yes' type='pflash'>/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw</loader>
|
<firmware>
|
||||||
<nvram>/some/user/nvram/path/guest_VARS.fd</nvram>
|
<feature enabled='no' name='enrolled-keys'/>
|
||||||
|
<feature enabled='no' name='secure-boot'/>
|
||||||
|
</firmware>
|
||||||
|
<loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader>
|
||||||
|
<nvram template='/usr/share/AAVMF/AAVMF_VARS.fd'>/var/lib/libvirt/qemu/nvram/test_VARS.fd</nvram>
|
||||||
<boot dev='hd'/>
|
<boot dev='hd'/>
|
||||||
</os>
|
</os>
|
||||||
<features>
|
<features>
|
||||||
|
@ -4,13 +4,20 @@
|
|||||||
<memory unit='KiB'>4194304</memory>
|
<memory unit='KiB'>4194304</memory>
|
||||||
<currentMemory unit='KiB'>4194304</currentMemory>
|
<currentMemory unit='KiB'>4194304</currentMemory>
|
||||||
<vcpu placement='static'>2</vcpu>
|
<vcpu placement='static'>2</vcpu>
|
||||||
<os>
|
<os firmware='efi'>
|
||||||
<type arch='x86_64' machine='q35'>hvm</type>
|
<type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
|
||||||
|
<firmware>
|
||||||
|
<feature enabled='yes' name='enrolled-keys'/>
|
||||||
|
<feature enabled='yes' name='secure-boot'/>
|
||||||
|
</firmware>
|
||||||
|
<loader readonly='yes' secure='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.secboot.fd</loader>
|
||||||
|
<nvram template='/usr/share/OVMF/OVMF_VARS.secboot.fd'>/var/lib/libvirt/qemu/nvram/test_VARS.fd</nvram>
|
||||||
<boot dev='hd'/>
|
<boot dev='hd'/>
|
||||||
</os>
|
</os>
|
||||||
<features>
|
<features>
|
||||||
<acpi/>
|
<acpi/>
|
||||||
<apic/>
|
<apic/>
|
||||||
|
<smm state='on'/>
|
||||||
</features>
|
</features>
|
||||||
<cpu mode='custom' match='exact' check='none'>
|
<cpu mode='custom' match='exact' check='none'>
|
||||||
<model fallback='forbid'>qemu64</model>
|
<model fallback='forbid'>qemu64</model>
|
||||||
|
Loading…
Reference in New Issue
Block a user