The data is tested against the latest qemu binaries so we should use the
proper architecture. Also the test is used against data from qemu 1.5.3
and thus we should use a machine type that qemu supported.
Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args | 4 ++--
tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args | 4 ++--
tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args | 4 ++--
tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args | 4 ++--
tests/qemuxml2argvdata/disk-cache.x86_64-latest.args | 4 ++--
tests/qemuxml2argvdata/disk-cache.xml | 4 ++--
tests/qemuxml2xmloutdata/disk-cache.xml | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
index b598bacb94..25360071e3 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
@@ -7,10 +7,10 @@ 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 \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
--machine pc-i440fx-2.6,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
index 7279921ae6..aa7a230583 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
@@ -7,12 +7,12 @@ 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 \
QEMU_AUDIO_DRV=none \
-/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 \
--machine pc-i440fx-2.6,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
index 82e45effba..64fd4308e4 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
@@ -7,12 +7,12 @@ 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 \
QEMU_AUDIO_DRV=none \
-/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 \
--machine pc-i440fx-2.6,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
index 8d0904260a..a6a448999b 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
@@ -7,12 +7,12 @@ 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 \
QEMU_AUDIO_DRV=none \
-/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 \
--machine pc-i440fx-2.6,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
index 3dca80dacd..4b70cb634c 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
@@ -7,12 +7,12 @@ 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 \
QEMU_AUDIO_DRV=none \
-/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 \
--machine pc-i440fx-2.6,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \
-cpu qemu64 \
-m 214 \
-overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/disk-cache.xml b/tests/qemuxml2argvdata/disk-cache.xml
index 5104c8469f..5cbbd2f3bc 100644
--- a/tests/qemuxml2argvdata/disk-cache.xml
+++ b/tests/qemuxml2argvdata/disk-cache.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc-i440fx-2.6'>hvm</type>
+ <type arch='x86_64' machine='pc-i440fx-1.5'>hvm</type>
<boot dev='hd'/>
</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='qcow2' cache='writeback'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/disk-cache.xml b/tests/qemuxml2xmloutdata/disk-cache.xml
index b81c9c2368..a622db347e 100644
--- a/tests/qemuxml2xmloutdata/disk-cache.xml
+++ b/tests/qemuxml2xmloutdata/disk-cache.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc-i440fx-2.6'>hvm</type>
+ <type arch='x86_64' machine='pc-i440fx-1.5'>hvm</type>
<boot dev='hd'/>
</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='qcow2' cache='writeback'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
--
2.24.1
