NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

tests: qemuxml2argv: Use 64 bit qemu binary and 1.5 machine type in 'disk-cache' case

Browse Source 
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@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2020-01-22 17:11:52 +01:00
parent 82dd011dbb
commit 66cba5c065
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
View File

@ -7,10 +7,10 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \ /usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \ -name QEMUGuest1 \
-S \ -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 \ -m 214 \
-realtime mlock=off \ -realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \ -smp 1,sockets=1,cores=1,threads=1 \

4
tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
View File

@ -7,12 +7,12 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \ /usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \ -name guest=QEMUGuest1,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,\ -object secret,id=masterKey0,format=raw,\
file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ 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 \ -m 214 \
-realtime mlock=off \ -realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \ -smp 1,sockets=1,cores=1,threads=1 \

4
tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
View File

@ -7,12 +7,12 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \ /usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \ -name guest=QEMUGuest1,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,\ -object secret,id=masterKey0,format=raw,\
file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ 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 \ -m 214 \
-realtime mlock=off \ -realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \ -smp 1,sockets=1,cores=1,threads=1 \

4
tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
View File

@ -7,12 +7,12 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \ /usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \ -name guest=QEMUGuest1,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,\ -object secret,id=masterKey0,format=raw,\
file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ 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 \ -m 214 \
-realtime mlock=off \ -realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \ -smp 1,sockets=1,cores=1,threads=1 \

4
tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
View File

@ -7,12 +7,12 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \ /usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \ -name guest=QEMUGuest1,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,\ -object secret,id=masterKey0,format=raw,\
file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ 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 \ -cpu qemu64 \
-m 214 \ -m 214 \
-overcommit mem-lock=off \ -overcommit mem-lock=off \

4
tests/qemuxml2argvdata/disk-cache.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory> <currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <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'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>
@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-i386</emulator> <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='qemu' type='qcow2' cache='writeback'/> <driver name='qemu' type='qcow2' cache='writeback'/>
<source dev='/dev/HostVG/QEMUGuest1'/> <source dev='/dev/HostVG/QEMUGuest1'/>

4
tests/qemuxml2xmloutdata/disk-cache.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory> <currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <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'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>
@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-i386</emulator> <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='qemu' type='qcow2' cache='writeback'/> <driver name='qemu' type='qcow2' cache='writeback'/>
<source dev='/dev/HostVG/QEMUGuest1'/> <source dev='/dev/HostVG/QEMUGuest1'/>