[libvirt PATCH 04/33] 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(a)redhat.com&gt; --- tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml | 4 ++-- tests/qemuxml2argvdata/firmware-manual-bios-stateless.args | 2 +- tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml | 4 ++-- tests/qemuxml2argvdata/firmware-manual-bios.args | 2 +- tests/qemuxml2argvdata/firmware-manual-bios.xml | 4 ++-- tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml | 4 ++-- tests/qemuxml2xmloutdata/firmware-manual-bios.xml | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml b/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml index b60878ca0b..6e5f87354a 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml +++ b/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml @@ -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> diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.args b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.args index 4f2ac0c682..3aa4fa90fa 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.args +++ b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.args @@ -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 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml index 9d6f4e4c83..fa644af8b9 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml +++ b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml @@ -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> diff --git a/tests/qemuxml2argvdata/firmware-manual-bios.args b/tests/qemuxml2argvdata/firmware-manual-bios.args index 4f2ac0c682..3aa4fa90fa 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios.args +++ b/tests/qemuxml2argvdata/firmware-manual-bios.args @@ -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 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-bios.xml b/tests/qemuxml2argvdata/firmware-manual-bios.xml index 3e1946029c..f5c33bc306 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios.xml +++ b/tests/qemuxml2argvdata/firmware-manual-bios.xml @@ -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> diff --git a/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml b/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml index de5ecb96dc..2fb7b49a79 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml @@ -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'/> diff --git a/tests/qemuxml2xmloutdata/firmware-manual-bios.xml b/tests/qemuxml2xmloutdata/firmware-manual-bios.xml index 75bb6038ca..47432ac525 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-bios.xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-bios.xml @@ -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'/> -- 2.39.1