tests: Remove 's390-virtio' machine caps faking

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>

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 1444abc401d9838107df21bb0699c75c81e514d2..be576037e2f085d1908c6241c8c318e9bd9a3e04 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -73,7 +73,7 @@ static const char *const riscv64_machines[] = {
     "spike_v1.10", "spike_v1.9.1", "sifive_e", "virt", "sifive_u", NULL
 };
 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[] = {
     "SS-5", "LX", "SPARCClassic", "SPARCbook",

diff --git a/tests/vircapstest.c b/tests/vircapstest.c
index 8cb6fafd1d8ab296f2a8a40fffe5f50b58679f5b..7ec5b85222c56f4f95d504fe5351293a99dbbc41 100644 (file)
--- a/tests/vircapstest.c
+++ b/tests/vircapstest.c
@@ -180,10 +180,6 @@ test_virCapsDomainDataLookupQEMU(const void *data G_GNUC_UNUSED)
     CAPSCOMP(-1, VIR_ARCH_RISCV64, VIR_DOMAIN_VIRT_NONE, NULL, NULL,
         VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_RISCV64,
         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",
         VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64,