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>

diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml b/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml
index b60878ca0b1ee207bf1d77028faec9ee5b6682c3..6e5f87354a0379d27eecace350dfbe8ae7bc4c92 100644 (file)
--- 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 4f2ac0c682fa4339d357b4ddf60ce95afcfd2efc..3aa4fa90fae1a8e42966b97c9d9e60c9ce897a5a 100644 (file)
--- 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 9d6f4e4c83ece38139c174fb000580d8fe0a90e9..fa644af8b9c399f60e191c76686c84a3051760c8 100644 (file)
--- 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 4f2ac0c682fa4339d357b4ddf60ce95afcfd2efc..3aa4fa90fae1a8e42966b97c9d9e60c9ce897a5a 100644 (file)
--- 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 3e1946029c208914a5af72babe5e979dadbbb8dc..f5c33bc30611f6ac3ad1af7ef6dd2aab082f3711 100644 (file)
--- 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 de5ecb96dc8b23c33a0820625558387f7cdc2d8d..2fb7b49a797e22d78558c7e7bceb5639577506ab 100644 (file)
--- 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 75bb6038ca26bb98d4acd6bc11eabd7f4f244467..47432ac5256cae050f7fd7f10ef745ea003233dd 100644 (file)
--- 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'/>