External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-03 16:42:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuxml2argvtest: Convert the rest of GIC tests to latest capabilities

Browse Source 
Convert the two negative cases to use real capapbilities as well as the
positive case for situations when KVM is not used by stripping the
QEMU_CAPS_KVM flag.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-03-24 11:15:40 +01:00
parent dae9c45539
commit 4f33f1325a
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/qemuxml2argvdata/aarch64-gic-invalid.err → tests/qemuxml2argvdata/aarch64-gic-invalid.aarch64-latest.err
View File

6
tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
View File

@ -9,11 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-guest/master-key.aes \
-machine virt,usb=off,gic-version=2,dump-guest-core=off \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \
-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram \
-accel tcg \
-cpu cortex-a57 \
-m 1024 \
-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
@ -27,4 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
-no-acpi \
-boot strict=on \
-audiodev '{"id":"audio1","driver":"none"}' \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on

0
tests/qemuxml2argvdata/aarch64-gic-not-virt.err → tests/qemuxml2argvdata/aarch64-gic-not-virt.aarch64-latest.err
View File

15
tests/qemuxml2argvtest.c
View File

@ -2406,8 +2406,12 @@ mymain(void)
DO_TEST_GIC("aarch64-gic-none-v2", GIC_V2);
DO_TEST_GIC("aarch64-gic-none-v3", GIC_V3);
DO_TEST_GIC("aarch64-gic-none-both", GIC_BOTH);
qemuTestSetHostArch(&driver, VIR_ARCH_AARCH64);
DO_TEST_FULL("aarch64-gic-none-tcg", "", ARG_GIC, GIC_BOTH, ARG_END);
DO_TEST_FULL("aarch64-gic-none-tcg", "",
ARG_GIC, GIC_BOTH,
ARG_CAPS_ARCH, "aarch64",
ARG_CAPS_VER, "latest",
ARG_QEMU_CAPS_DEL, QEMU_CAPS_KVM, QEMU_CAPS_LAST,
ARG_END);
DO_TEST_FULL("aarch64-gic-default", ".aarch64-4.2.0",
ARG_GIC, GIC_NONE,
ARG_CAPS_ARCH, "aarch64",
@ -2433,11 +2437,8 @@ mymain(void)
DO_TEST_GIC("aarch64-gic-host", GIC_V2);
DO_TEST_GIC("aarch64-gic-host", GIC_V3);
DO_TEST_GIC("aarch64-gic-host", GIC_BOTH);
qemuTestSetHostArch(&driver, VIR_ARCH_AARCH64);
DO_TEST_PARSE_ERROR("aarch64-gic-invalid",
QEMU_CAPS_KVM);
DO_TEST_PARSE_ERROR("aarch64-gic-not-virt",
QEMU_CAPS_KVM);
DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-invalid", "aarch64");
DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-not-virt", "aarch64");
DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-not-arm", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("aarch64-kvm-32-on-64", "aarch64");
DO_TEST("aarch64-pci-serial",