mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-12 13:17:58 +03:00
tests: Use x86_64 for all x86 firmware tests
Most test cases are on 64-bit architectures already, but there are a couple of exceptions. Right now this works, but it will no longer fly after some upcoming changes. Prepare for those by switching away from 32-bit architectures. Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
32f9342b5b
commit
df551718a1
@ -4,11 +4,11 @@
|
||||
<memory unit='KiB'>1048576</memory>
|
||||
<vcpu placement='static'>1</vcpu>
|
||||
<os>
|
||||
<type arch='i686' machine='pc'>hvm</type>
|
||||
<type arch='x86_64' machine='pc'>hvm</type>
|
||||
<loader stateless='no'>/usr/share/seabios/bios.bin</loader>
|
||||
</os>
|
||||
<devices>
|
||||
<emulator>/usr/bin/qemu-system-i386</emulator>
|
||||
<emulator>/usr/bin/qemu-system-x86_64</emulator>
|
||||
<controller type='usb' model='none'/>
|
||||
<memballoon model='none'/>
|
||||
</devices>
|
||||
|
@ -6,7 +6,7 @@ LOGNAME=test \
|
||||
XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
|
||||
XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
|
||||
XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
|
||||
/usr/bin/qemu-system-i386 \
|
||||
/usr/bin/qemu-system-x86_64 \
|
||||
-name guest=test-bios,debug-threads=on \
|
||||
-S \
|
||||
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes \
|
||||
|
@ -4,11 +4,11 @@
|
||||
<memory unit='KiB'>1048576</memory>
|
||||
<vcpu placement='static'>1</vcpu>
|
||||
<os>
|
||||
<type arch='i686' machine='pc'>hvm</type>
|
||||
<type arch='x86_64' machine='pc'>hvm</type>
|
||||
<loader stateless='yes'>/usr/share/seabios/bios.bin</loader>
|
||||
</os>
|
||||
<devices>
|
||||
<emulator>/usr/bin/qemu-system-i386</emulator>
|
||||
<emulator>/usr/bin/qemu-system-x86_64</emulator>
|
||||
<controller type='usb' model='none'/>
|
||||
<memballoon model='none'/>
|
||||
</devices>
|
||||
|
@ -6,7 +6,7 @@ LOGNAME=test \
|
||||
XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
|
||||
XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
|
||||
XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
|
||||
/usr/bin/qemu-system-i386 \
|
||||
/usr/bin/qemu-system-x86_64 \
|
||||
-name guest=test-bios,debug-threads=on \
|
||||
-S \
|
||||
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes \
|
||||
|
@ -4,11 +4,11 @@
|
||||
<memory unit='KiB'>1048576</memory>
|
||||
<vcpu placement='static'>1</vcpu>
|
||||
<os>
|
||||
<type arch='i686' machine='pc'>hvm</type>
|
||||
<type arch='x86_64' machine='pc'>hvm</type>
|
||||
<loader>/usr/share/seabios/bios.bin</loader>
|
||||
</os>
|
||||
<devices>
|
||||
<emulator>/usr/bin/qemu-system-i386</emulator>
|
||||
<emulator>/usr/bin/qemu-system-x86_64</emulator>
|
||||
<controller type='usb' model='none'/>
|
||||
<memballoon model='none'/>
|
||||
</devices>
|
||||
|
@ -5,7 +5,7 @@
|
||||
<currentMemory unit='KiB'>1048576</currentMemory>
|
||||
<vcpu placement='static'>1</vcpu>
|
||||
<os>
|
||||
<type arch='i686' machine='pc'>hvm</type>
|
||||
<type arch='x86_64' machine='pc'>hvm</type>
|
||||
<loader type='rom' stateless='yes'>/usr/share/seabios/bios.bin</loader>
|
||||
<boot dev='hd'/>
|
||||
</os>
|
||||
@ -14,7 +14,7 @@
|
||||
<on_reboot>restart</on_reboot>
|
||||
<on_crash>destroy</on_crash>
|
||||
<devices>
|
||||
<emulator>/usr/bin/qemu-system-i386</emulator>
|
||||
<emulator>/usr/bin/qemu-system-x86_64</emulator>
|
||||
<controller type='usb' index='0' model='none'/>
|
||||
<controller type='pci' index='0' model='pci-root'/>
|
||||
<input type='mouse' bus='ps2'/>
|
||||
|
@ -5,7 +5,7 @@
|
||||
<currentMemory unit='KiB'>1048576</currentMemory>
|
||||
<vcpu placement='static'>1</vcpu>
|
||||
<os>
|
||||
<type arch='i686' machine='pc'>hvm</type>
|
||||
<type arch='x86_64' machine='pc'>hvm</type>
|
||||
<loader type='rom'>/usr/share/seabios/bios.bin</loader>
|
||||
<boot dev='hd'/>
|
||||
</os>
|
||||
@ -14,7 +14,7 @@
|
||||
<on_reboot>restart</on_reboot>
|
||||
<on_crash>destroy</on_crash>
|
||||
<devices>
|
||||
<emulator>/usr/bin/qemu-system-i386</emulator>
|
||||
<emulator>/usr/bin/qemu-system-x86_64</emulator>
|
||||
<controller type='usb' index='0' model='none'/>
|
||||
<controller type='pci' index='0' model='pci-root'/>
|
||||
<input type='mouse' bus='ps2'/>
|
||||
|
Loading…
Reference in New Issue
Block a user