[PATCH 2/3] tests: qemuxml2argv: Use x86_64 arch and emulator in all boot* test files
Peter Krempa
pkrempa at redhat.com
Thu Aug 25 12:27:00 UTC 2022
Using the modern emulator and arch will allow us to convert all of the
tests to use DO_TEST_CAPS_LATEST.
Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
tests/qemuxml2argvdata/boot-cdrom.args | 2 +-
tests/qemuxml2argvdata/boot-cdrom.xml | 4 ++--
tests/qemuxml2argvdata/boot-complex.args | 2 +-
tests/qemuxml2argvdata/boot-complex.xml | 4 ++--
tests/qemuxml2argvdata/boot-dev+order.xml | 4 ++--
tests/qemuxml2argvdata/boot-floppy.args | 2 +-
tests/qemuxml2argvdata/boot-floppy.xml | 4 ++--
tests/qemuxml2argvdata/boot-menu-disable-drive.args | 2 +-
tests/qemuxml2argvdata/boot-menu-disable-drive.xml | 4 ++--
tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml | 4 ++--
tests/qemuxml2argvdata/boot-menu-disable.args | 2 +-
tests/qemuxml2argvdata/boot-menu-disable.xml | 4 ++--
.../boot-menu-enable-with-timeout-invalid.xml | 4 ++--
tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args | 2 +-
tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml | 4 ++--
tests/qemuxml2argvdata/boot-menu-enable.args | 2 +-
tests/qemuxml2argvdata/boot-menu-enable.xml | 4 ++--
tests/qemuxml2argvdata/boot-multi.args | 2 +-
tests/qemuxml2argvdata/boot-multi.xml | 4 ++--
tests/qemuxml2argvdata/boot-network.args | 2 +-
tests/qemuxml2argvdata/boot-network.xml | 4 ++--
tests/qemuxml2argvdata/boot-order.args | 2 +-
tests/qemuxml2argvdata/boot-order.xml | 4 ++--
tests/qemuxml2xmloutdata/boot-cdrom.xml | 4 ++--
tests/qemuxml2xmloutdata/boot-floppy.xml | 4 ++--
tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml | 4 ++--
tests/qemuxml2xmloutdata/boot-menu-disable.xml | 4 ++--
tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml | 4 ++--
tests/qemuxml2xmloutdata/boot-multi.xml | 4 ++--
tests/qemuxml2xmloutdata/boot-network.xml | 4 ++--
tests/qemuxml2xmloutdata/boot-order.xml | 4 ++--
31 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/tests/qemuxml2argvdata/boot-cdrom.args b/tests/qemuxml2argvdata/boot-cdrom.args
index cba00fa112..acd342ecb6 100644
--- a/tests/qemuxml2argvdata/boot-cdrom.args
+++ b/tests/qemuxml2argvdata/boot-cdrom.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/boot-cdrom.xml b/tests/qemuxml2argvdata/boot-cdrom.xml
index 374c8c38ce..17bdaa06cc 100644
--- a/tests/qemuxml2argvdata/boot-cdrom.xml
+++ b/tests/qemuxml2argvdata/boot-cdrom.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,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>
<disk type='block' device='cdrom'>
<driver name='qemu' type='raw'/>
<source dev='/dev/cdrom'/>
diff --git a/tests/qemuxml2argvdata/boot-complex.args b/tests/qemuxml2argvdata/boot-complex.args
index 5eb78e291b..27ab215bc7 100644
--- a/tests/qemuxml2argvdata/boot-complex.args
+++ b/tests/qemuxml2argvdata/boot-complex.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/boot-complex.xml b/tests/qemuxml2argvdata/boot-complex.xml
index 959acfb4ca..b269079f56 100644
--- a/tests/qemuxml2argvdata/boot-complex.xml
+++ b/tests/qemuxml2argvdata/boot-complex.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/>
<boot dev='network'/>
<boot dev='hd'/>
@@ -16,7 +16,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>
<disk type='file' device='disk'>
<source file='/tmp/vdb.img'/>
<target dev='vdb' bus='virtio'/>
diff --git a/tests/qemuxml2argvdata/boot-dev+order.xml b/tests/qemuxml2argvdata/boot-dev+order.xml
index 8a25161d1f..2cbba4b3ce 100644
--- a/tests/qemuxml2argvdata/boot-dev+order.xml
+++ b/tests/qemuxml2argvdata/boot-dev+order.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
<boot dev='cdrom'/>
<boot dev='network'/>
@@ -15,7 +15,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>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/boot-floppy.args b/tests/qemuxml2argvdata/boot-floppy.args
index 467ca1342b..6791337632 100644
--- a/tests/qemuxml2argvdata/boot-floppy.args
+++ b/tests/qemuxml2argvdata/boot-floppy.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/boot-floppy.xml b/tests/qemuxml2argvdata/boot-floppy.xml
index 324c9c81d8..5de6f08f44 100644
--- a/tests/qemuxml2argvdata/boot-floppy.xml
+++ b/tests/qemuxml2argvdata/boot-floppy.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='fd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,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>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
index e307121a6e..38c0b23faf 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.xml b/tests/qemuxml2argvdata/boot-menu-disable-drive.xml
index e33b61f13f..22ca640783 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable-drive.xml
+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/>
<bootmenu enable='no'/>
</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>
<disk type='block' device='cdrom'>
<source dev='/dev/cdrom'/>
<target dev='hdc' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml b/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml
index a7ae02fda0..271c5922be 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml
+++ b/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/>
<bootmenu enable='no' timeout='3000'/>
</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>
<disk type='block' device='cdrom'>
<source dev='/dev/cdrom'/>
<target dev='hdc' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args b/tests/qemuxml2argvdata/boot-menu-disable.args
index e307121a6e..38c0b23faf 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/boot-menu-disable.xml b/tests/qemuxml2argvdata/boot-menu-disable.xml
index 6a61f088d9..80b22b7cad 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable.xml
+++ b/tests/qemuxml2argvdata/boot-menu-disable.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/>
<bootmenu enable='no'/>
</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>
<disk type='block' device='cdrom'>
<source dev='/dev/cdrom'/>
<target dev='hdc' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml
index 5af6f5bb95..973ae3c979 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/>
<bootmenu enable='yes' timeout='65536'/>
</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>
<disk type='block' device='cdrom'>
<source dev='/dev/cdrom'/>
<target dev='hdc' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
index d77a63ae5e..01b2282522 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml
index e467aedd1e..f396bdf4c0 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/>
<bootmenu enable='yes' timeout='3000'/>
</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>
<disk type='block' device='cdrom'>
<source dev='/dev/cdrom'/>
<target dev='hdc' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args b/tests/qemuxml2argvdata/boot-menu-enable.args
index 777918fa80..c282f1ed3d 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/boot-menu-enable.xml b/tests/qemuxml2argvdata/boot-menu-enable.xml
index 5f2f4aedb4..6deaba80ef 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable.xml
+++ b/tests/qemuxml2argvdata/boot-menu-enable.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/>
<bootmenu enable='yes'/>
</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>
<disk type='block' device='cdrom'>
<source dev='/dev/cdrom'/>
<target dev='hdc' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/boot-multi.args b/tests/qemuxml2argvdata/boot-multi.args
index 777918fa80..c282f1ed3d 100644
--- a/tests/qemuxml2argvdata/boot-multi.args
+++ b/tests/qemuxml2argvdata/boot-multi.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/boot-multi.xml b/tests/qemuxml2argvdata/boot-multi.xml
index 83f8e6aa23..0e4c5111e0 100644
--- a/tests/qemuxml2argvdata/boot-multi.xml
+++ b/tests/qemuxml2argvdata/boot-multi.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/>
<boot dev='hd'/>
<boot dev='network'/>
@@ -17,7 +17,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>
<disk type='block' device='cdrom'>
<source dev='/dev/cdrom'/>
<target dev='hdc' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/boot-network.args b/tests/qemuxml2argvdata/boot-network.args
index 451e5ef66a..b36f58bbac 100644
--- a/tests/qemuxml2argvdata/boot-network.args
+++ b/tests/qemuxml2argvdata/boot-network.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/boot-network.xml b/tests/qemuxml2argvdata/boot-network.xml
index 6233605ac5..003f607f80 100644
--- a/tests/qemuxml2argvdata/boot-network.xml
+++ b/tests/qemuxml2argvdata/boot-network.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,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>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdata/boot-order.args
index ab90d22b28..0e49742f5d 100644
--- a/tests/qemuxml2argvdata/boot-order.args
+++ b/tests/qemuxml2argvdata/boot-order.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/boot-order.xml b/tests/qemuxml2argvdata/boot-order.xml
index a810f46021..4edbe5ed94 100644
--- a/tests/qemuxml2argvdata/boot-order.xml
+++ b/tests/qemuxml2argvdata/boot-order.xml
@@ -5,14 +5,14 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<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>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2xmloutdata/boot-cdrom.xml b/tests/qemuxml2xmloutdata/boot-cdrom.xml
index 4729edaa63..4666777e56 100644
--- a/tests/qemuxml2xmloutdata/boot-cdrom.xml
+++ b/tests/qemuxml2xmloutdata/boot-cdrom.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,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>
<disk type='block' device='cdrom'>
<driver name='qemu' type='raw'/>
<source dev='/dev/cdrom'/>
diff --git a/tests/qemuxml2xmloutdata/boot-floppy.xml b/tests/qemuxml2xmloutdata/boot-floppy.xml
index 0bf53f50f1..7c163b5c99 100644
--- a/tests/qemuxml2xmloutdata/boot-floppy.xml
+++ b/tests/qemuxml2xmloutdata/boot-floppy.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='fd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,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>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
index 82285b3017..04c8d42513 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/>
<bootmenu enable='no'/>
</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>
<disk type='block' device='cdrom'>
<driver name='qemu' type='raw'/>
<source dev='/dev/cdrom'/>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable.xml b/tests/qemuxml2xmloutdata/boot-menu-disable.xml
index 82285b3017..04c8d42513 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-disable.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-disable.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/>
<bootmenu enable='no'/>
</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>
<disk type='block' device='cdrom'>
<driver name='qemu' type='raw'/>
<source dev='/dev/cdrom'/>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
index 994331ce0f..e951750af5 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/>
<bootmenu enable='yes' timeout='3000'/>
</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>
<disk type='block' device='cdrom'>
<driver name='qemu' type='raw'/>
<source dev='/dev/cdrom'/>
diff --git a/tests/qemuxml2xmloutdata/boot-multi.xml b/tests/qemuxml2xmloutdata/boot-multi.xml
index abb098be58..8c16bd9d11 100644
--- a/tests/qemuxml2xmloutdata/boot-multi.xml
+++ b/tests/qemuxml2xmloutdata/boot-multi.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/>
<boot dev='hd'/>
<boot dev='network'/>
@@ -17,7 +17,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>
<disk type='block' device='cdrom'>
<driver name='qemu' type='raw'/>
<source dev='/dev/cdrom'/>
diff --git a/tests/qemuxml2xmloutdata/boot-network.xml b/tests/qemuxml2xmloutdata/boot-network.xml
index 7df0512077..4722ede3b7 100644
--- a/tests/qemuxml2xmloutdata/boot-network.xml
+++ b/tests/qemuxml2xmloutdata/boot-network.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,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>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/boot-order.xml b/tests/qemuxml2xmloutdata/boot-order.xml
index 59568214eb..843bebda9c 100644
--- a/tests/qemuxml2xmloutdata/boot-order.xml
+++ b/tests/qemuxml2xmloutdata/boot-order.xml
@@ -5,14 +5,14 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<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>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
--
2.37.1
More information about the libvir-list
mailing list