External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-18 10:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuxml2argvdata: Use proper arch and emulator for aarch64 real capability tests

Browse Source 
Upcoming patches will modify how we populate the capability cache in
tests to be more sane. This also means that the emulator binary and
architecture used in the test files using real capabilities must match
what the real capabilities have.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-01-04 16:36:46 +01:00
parent c9880b647b
commit 0a4e33ffde
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
View File

@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \ XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \ XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
QEMU_AUDIO_DRV=none \ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-arm \ /usr/bin/qemu-system-aarch64 \
-name guest=armtest,debug-threads=on \ -name guest=armtest,debug-threads=on \
-S \ -S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-armtest/master-key.aes \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-armtest/master-key.aes \
@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \ -mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \ -rtc base=utc \
-no-shutdown \ -no-shutdown \
-no-acpi \
-boot strict=on \ -boot strict=on \
-kernel /arm.kernel \ -kernel /arm.kernel \
-initrd /arm.initrd \ -initrd /arm.initrd \

3
tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args
View File

@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \ XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \ XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \ XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
/usr/bin/qemu-system-arm \ /usr/bin/qemu-system-aarch64 \
-name guest=armtest,debug-threads=on \ -name guest=armtest,debug-threads=on \
-S \ -S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-armtest/master-key.aes"}' \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-armtest/master-key.aes"}' \
@ -25,6 +25,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
-mon chardev=charmonitor,id=monitor,mode=control \ -mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \ -rtc base=utc \
-no-shutdown \ -no-shutdown \
-no-acpi \
-boot strict=on \ -boot strict=on \
-kernel /arm.kernel \ -kernel /arm.kernel \
-initrd /arm.initrd \ -initrd /arm.initrd \

5
tests/qemuxml2argvdata/disk-arm-virtio-sd.xml
View File

@ -5,14 +5,13 @@
<currentMemory>1048576</currentMemory> <currentMemory>1048576</currentMemory>
<vcpu>1</vcpu> <vcpu>1</vcpu>
<os> <os>
<type arch="armv7l" machine="vexpress-a9">hvm</type> <type arch="aarch64" machine="vexpress-a9">hvm</type>
<kernel>/arm.kernel</kernel> <kernel>/arm.kernel</kernel>
<initrd>/arm.initrd</initrd> <initrd>/arm.initrd</initrd>
<dtb>/arm.dtb</dtb> <dtb>/arm.dtb</dtb>
<cmdline>console=ttyAMA0,115200n8 rw root=/dev/vda3 rootwait physmap.enabled=0</cmdline> <cmdline>console=ttyAMA0,115200n8 rw root=/dev/vda3 rootwait physmap.enabled=0</cmdline>
</os> </os>
<features> <features>
<acpi/>
<apic/> <apic/>
<pae/> <pae/>
</features> </features>
@ -21,7 +20,7 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-arm</emulator> <emulator>/usr/bin/qemu-system-aarch64</emulator>
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/> <driver name='qemu' type='qcow2'/>
<source file='/arm-sd.qcow2'/> <source file='/arm-sd.qcow2'/>

5
tests/qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory> <currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='armv7l' machine='vexpress-a9'>hvm</type> <type arch='aarch64' machine='vexpress-a9'>hvm</type>
<kernel>/arm.kernel</kernel> <kernel>/arm.kernel</kernel>
<initrd>/arm.initrd</initrd> <initrd>/arm.initrd</initrd>
<cmdline>console=ttyAMA0,115200n8 rw root=/dev/vda3 rootwait physmap.enabled=0</cmdline> <cmdline>console=ttyAMA0,115200n8 rw root=/dev/vda3 rootwait physmap.enabled=0</cmdline>
@ -13,7 +13,6 @@
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<features> <features>
<acpi/>
<apic/> <apic/>
<pae/> <pae/>
</features> </features>
@ -25,7 +24,7 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-arm</emulator> <emulator>/usr/bin/qemu-system-aarch64</emulator>
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/> <driver name='qemu' type='qcow2'/>
<source file='/arm-sd.qcow2'/> <source file='/arm-sd.qcow2'/>