External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-03 12:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Remove 's390-virtio' machine caps faking

Browse Source 
The machine type was removed in qemu 2.6 and no tests now depend on it.
Remove the faking of the machine type support and the capabilities test
for it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-06-11 10:30:31 +02:00
parent 5d83508fe8
commit e1337ed0cc
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/testutilsqemu.c
View File

@ -73,7 +73,7 @@ static const char *const riscv64_machines[] = {
"spike_v1.10", "spike_v1.9.1", "sifive_e", "virt", "sifive_u", NULL "spike_v1.10", "spike_v1.9.1", "sifive_e", "virt", "sifive_u", NULL
}; };
static const char *const s390x_machines[] = { static const char *const s390x_machines[] = {
"s390-virtio", "s390-ccw-virtio", "s390-ccw", NULL "s390-ccw-virtio", "s390-ccw", NULL
}; };
static const char *const sparc_machines[] = { static const char *const sparc_machines[] = {
"SS-5", "LX", "SPARCClassic", "SPARCbook", "SS-5", "LX", "SPARCClassic", "SPARCbook",

4
tests/vircapstest.c
View File

@ -180,10 +180,6 @@ test_virCapsDomainDataLookupQEMU(const void *data G_GNUC_UNUSED)
CAPSCOMP(-1, VIR_ARCH_RISCV64, VIR_DOMAIN_VIRT_NONE, NULL, NULL, CAPSCOMP(-1, VIR_ARCH_RISCV64, VIR_DOMAIN_VIRT_NONE, NULL, NULL,
VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_RISCV64, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_RISCV64,
VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-riscv64", "spike_v1.10"); VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-riscv64", "spike_v1.10");
CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, "s390-virtio",
VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_S390X,
VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-s390x",
"s390-virtio");
CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, "pseries", CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, "pseries",
VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64,