shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

qemuxml2argvtest: Remove always asserted s390 capabilities

Browse Source 
QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP and QEMU_CAPS_LOADPARM
are always asserted via virQEMUCapsInitQMPBasicArch thus don't need to
be explicitly enabled by tests.

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-06 16:29:06 +01:00
parent f12b0b4a7a
commit 1f01ce1e29
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/qemuxml2argvtest.c
View File

@ -2599,54 +2599,39 @@ mymain(void)
DO_TEST_CAPS_LATEST("memory-hotplug-virtio-mem"); DO_TEST_CAPS_LATEST("memory-hotplug-virtio-mem");
DO_TEST("machine-aeskeywrap-on-caps", DO_TEST("machine-aeskeywrap-on-caps",
QEMU_CAPS_AES_KEY_WRAP,
QEMU_CAPS_DEA_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI); QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("machine-aeskeywrap-on-cap", DO_TEST("machine-aeskeywrap-on-cap",
QEMU_CAPS_AES_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI); QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("machine-aeskeywrap-off-caps", DO_TEST("machine-aeskeywrap-off-caps",
QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI); QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("machine-aeskeywrap-off-cap", DO_TEST("machine-aeskeywrap-off-cap",
QEMU_CAPS_AES_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI); QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("machine-deakeywrap-on-caps", DO_TEST("machine-deakeywrap-on-caps",
QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI); QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("machine-deakeywrap-on-cap", DO_TEST("machine-deakeywrap-on-cap",
QEMU_CAPS_DEA_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI); QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("machine-deakeywrap-off-caps", DO_TEST("machine-deakeywrap-off-caps",
QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI); QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("machine-deakeywrap-off-cap", DO_TEST("machine-deakeywrap-off-cap",
QEMU_CAPS_DEA_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI); QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("machine-keywrap-none-caps", DO_TEST("machine-keywrap-none-caps",
QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI); QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("machine-keywrap-none", DO_TEST("machine-keywrap-none",
QEMU_CAPS_VIRTIO_SCSI); QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("machine-loadparm-s390", DO_TEST_NOCAPS("machine-loadparm-s390");
QEMU_CAPS_LOADPARM); DO_TEST_NOCAPS("machine-loadparm-net-s390");
DO_TEST("machine-loadparm-net-s390", DO_TEST_NOCAPS("machine-loadparm-multiple-disks-nets-s390");
QEMU_CAPS_LOADPARM); DO_TEST_PARSE_ERROR_NOCAPS("machine-loadparm-s390-char-invalid");
DO_TEST("machine-loadparm-multiple-disks-nets-s390", DO_TEST_PARSE_ERROR_NOCAPS("machine-loadparm-s390-len-invalid");
QEMU_CAPS_LOADPARM);
DO_TEST_PARSE_ERROR("machine-loadparm-s390-char-invalid",
QEMU_CAPS_LOADPARM);
DO_TEST_PARSE_ERROR("machine-loadparm-s390-len-invalid",
QEMU_CAPS_LOADPARM);
DO_TEST_NOCAPS("qemu-ns-domain-ns0"); DO_TEST_NOCAPS("qemu-ns-domain-ns0");
DO_TEST_NOCAPS("qemu-ns-domain-commandline"); DO_TEST_NOCAPS("qemu-ns-domain-commandline");