From nobody Fri Apr 26 16:51:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1549024159417694.0631703722476; Fri, 1 Feb 2019 04:29:19 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DA20CC070154; Fri, 1 Feb 2019 12:29:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C14D5608C2; Fri, 1 Feb 2019 12:29:14 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id ACAC8C87E; Fri, 1 Feb 2019 12:29:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x11CTA9F014106 for ; Fri, 1 Feb 2019 07:29:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8028161520; Fri, 1 Feb 2019 12:29:10 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5FD855D6AA for ; Fri, 1 Feb 2019 12:29:06 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 1 Feb 2019 13:29:05 +0100 Message-Id: <20190201122905.7715-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] tests: Unify qemucaps2xml output files X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 01 Feb 2019 12:29:17 +0000 (UTC) Turns out different versions of QEMU on the same architecture produce the same output, so we can have a single output file per architecture instead of duplicating the same data over and over again. Spotted-by: J=C3=A1n Tomko Signed-off-by: Andrea Bolognani --- ...ps_2.10.0.aarch64.xml =3D> caps.aarch64.xml} | 0 .../{caps_2.10.0.ppc64.xml =3D> caps.ppc64.xml} | 0 ...aps_3.0.0.riscv32.xml =3D> caps.riscv32.xml} | 0 ...aps_3.0.0.riscv64.xml =3D> caps.riscv64.xml} | 0 .../{caps_2.10.0.s390x.xml =3D> caps.s390x.xml} | 0 ...{caps_1.5.3.x86_64.xml =3D> caps.x86_64.xml} | 0 .../qemucaps2xmloutdata/caps_1.6.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_1.7.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.1.1.x86_64.xml | 28 ------------------- .../caps_2.10.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.11.0.s390x.xml | 26 ----------------- .../caps_2.11.0.x86_64.xml | 28 ------------------- .../caps_2.12.0.aarch64.xml | 27 ------------------ .../qemucaps2xmloutdata/caps_2.12.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.12.0.s390x.xml | 26 ----------------- .../caps_2.12.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.4.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.5.0.x86_64.xml | 28 ------------------- .../caps_2.6.0.aarch64.xml | 27 ------------------ .../qemucaps2xmloutdata/caps_2.6.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.6.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.7.0.s390x.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.7.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.8.0.s390x.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.8.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.9.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.9.0.s390x.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.9.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_3.0.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_3.0.0.s390x.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_3.0.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_3.1.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_3.1.0.x86_64.xml | 28 ------------------- .../caps_4.0.0.riscv32.xml | 25 ----------------- .../caps_4.0.0.riscv64.xml | 25 ----------------- .../qemucaps2xmloutdata/caps_4.0.0.x86_64.xml | 28 ------------------- tests/qemucaps2xmltest.c | 4 +-- 37 files changed, 2 insertions(+), 812 deletions(-) rename tests/qemucaps2xmloutdata/{caps_2.10.0.aarch64.xml =3D> caps.aarch6= 4.xml} (100%) rename tests/qemucaps2xmloutdata/{caps_2.10.0.ppc64.xml =3D> caps.ppc64.xm= l} (100%) rename tests/qemucaps2xmloutdata/{caps_3.0.0.riscv32.xml =3D> caps.riscv32= .xml} (100%) rename tests/qemucaps2xmloutdata/{caps_3.0.0.riscv64.xml =3D> caps.riscv64= .xml} (100%) rename tests/qemucaps2xmloutdata/{caps_2.10.0.s390x.xml =3D> caps.s390x.xm= l} (100%) rename tests/qemucaps2xmloutdata/{caps_1.5.3.x86_64.xml =3D> caps.x86_64.x= ml} (100%) delete mode 100644 tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml b/tests/qemu= caps2xmloutdata/caps.aarch64.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml rename to tests/qemucaps2xmloutdata/caps.aarch64.xml diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml b/tests/qemuca= ps2xmloutdata/caps.ppc64.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml rename to tests/qemucaps2xmloutdata/caps.ppc64.xml diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.riscv32.xml b/tests/qemuc= aps2xmloutdata/caps.riscv32.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_3.0.0.riscv32.xml rename to tests/qemucaps2xmloutdata/caps.riscv32.xml diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.riscv64.xml b/tests/qemuc= aps2xmloutdata/caps.riscv64.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_3.0.0.riscv64.xml rename to tests/qemucaps2xmloutdata/caps.riscv64.xml diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml b/tests/qemuca= ps2xmloutdata/caps.s390x.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml rename to tests/qemucaps2xmloutdata/caps.s390x.xml diff --git a/tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml b/tests/qemuca= ps2xmloutdata/caps.x86_64.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml rename to tests/qemucaps2xmloutdata/caps.x86_64.xml diff --git a/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml b/tests/qemuca= ps2xmloutdata/caps_1.6.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - x86_64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-x86_64 - - - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml b/tests/qemuca= ps2xmloutdata/caps_1.7.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - x86_64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-x86_64 - - - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml b/tests/qemuca= ps2xmloutdata/caps_2.1.1.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - x86_64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-x86_64 - - - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml b/tests/qemuc= aps2xmloutdata/caps_2.10.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - x86_64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-x86_64 - - - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml b/tests/qemuca= ps2xmloutdata/caps_2.11.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - s390x - - - - - - - hvm - - 64 - /usr/bin/qemu-system-s390x - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml b/tests/qemuc= aps2xmloutdata/caps_2.11.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - x86_64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-x86_64 - - - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml b/tests/qemu= caps2xmloutdata/caps_2.12.0.aarch64.xml deleted file mode 100644 index f6572c8ecd..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - aarch64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-aarch64 - - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml b/tests/qemuca= ps2xmloutdata/caps_2.12.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - ppc64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-ppc64 - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml b/tests/qemuca= ps2xmloutdata/caps_2.12.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - s390x - - - - - - - hvm - - 64 - /usr/bin/qemu-system-s390x - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml b/tests/qemuc= aps2xmloutdata/caps_2.12.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - x86_64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-x86_64 - - - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml b/tests/qemuca= ps2xmloutdata/caps_2.4.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - x86_64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-x86_64 - - - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml b/tests/qemuca= ps2xmloutdata/caps_2.5.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - x86_64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-x86_64 - - - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml b/tests/qemuc= aps2xmloutdata/caps_2.6.0.aarch64.xml deleted file mode 100644 index f6572c8ecd..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - aarch64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-aarch64 - - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml b/tests/qemucap= s2xmloutdata/caps_2.6.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - ppc64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-ppc64 - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml b/tests/qemuca= ps2xmloutdata/caps_2.6.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - x86_64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-x86_64 - - - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml b/tests/qemucap= s2xmloutdata/caps_2.7.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - s390x - - - - - - - hvm - - 64 - /usr/bin/qemu-system-s390x - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml b/tests/qemuca= ps2xmloutdata/caps_2.7.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - x86_64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-x86_64 - - - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml b/tests/qemucap= s2xmloutdata/caps_2.8.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - s390x - - - - - - - hvm - - 64 - /usr/bin/qemu-system-s390x - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml b/tests/qemuca= ps2xmloutdata/caps_2.8.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - x86_64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-x86_64 - - - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml b/tests/qemucap= s2xmloutdata/caps_2.9.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - ppc64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-ppc64 - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml b/tests/qemucap= s2xmloutdata/caps_2.9.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - s390x - - - - - - - hvm - - 64 - /usr/bin/qemu-system-s390x - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml b/tests/qemuca= ps2xmloutdata/caps_2.9.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - x86_64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-x86_64 - - - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml b/tests/qemucap= s2xmloutdata/caps_3.0.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - ppc64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-ppc64 - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml b/tests/qemucap= s2xmloutdata/caps_3.0.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - s390x - - - - - - - hvm - - 64 - /usr/bin/qemu-system-s390x - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml b/tests/qemuca= ps2xmloutdata/caps_3.0.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - x86_64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-x86_64 - - - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml b/tests/qemucap= s2xmloutdata/caps_3.1.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - ppc64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-ppc64 - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml b/tests/qemuca= ps2xmloutdata/caps_3.1.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - x86_64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-x86_64 - - - - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml b/tests/qemuc= aps2xmloutdata/caps_4.0.0.riscv32.xml deleted file mode 100644 index 63c374da7f..0000000000 --- a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - riscv32 - - - - - - - hvm - - 32 - /usr/bin/qemu-system-riscv32 - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml b/tests/qemuc= aps2xmloutdata/caps_4.0.0.riscv64.xml deleted file mode 100644 index 09b7eb7f2f..0000000000 --- a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - riscv64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-riscv64 - - - - - - - - - - diff --git a/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml b/tests/qemuca= ps2xmloutdata/caps_4.0.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - x86_64 - - - - - - - hvm - - 64 - /usr/bin/qemu-system-x86_64 - - - - - - - - - - - - - diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index ec9d16e8dd..0d9b4e679a 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -128,8 +128,8 @@ testQemuCapsXML(const void *opaque) char *capsXml =3D NULL; virCapsPtr capsProvided =3D NULL; =20 - if (virAsprintf(&xmlFile, "%s/qemucaps2xmloutdata/%s.%s.xml", - abs_srcdir, data->base, data->archName) < 0) + if (virAsprintf(&xmlFile, "%s/qemucaps2xmloutdata/caps.%s.xml", + abs_srcdir, data->archName) < 0) goto cleanup; =20 if (virAsprintf(&capsFile, "%s/qemucapabilitiesdata/%s.%s.xml", --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list