From nobody Wed Feb 11 09:01:49 2026 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.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1491572685185304.3092592424291; Fri, 7 Apr 2017 06:44:45 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 67AA9C073D4B; Fri, 7 Apr 2017 13:44:43 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 37EF618B30; Fri, 7 Apr 2017 13:44:43 +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 D0AD118523CF; Fri, 7 Apr 2017 13:44:42 +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 v37DiY4V027136 for ; Fri, 7 Apr 2017 09:44:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id C70D6B11FA; Fri, 7 Apr 2017 13:44:34 +0000 (UTC) Received: from antique-work.brq.redhat.com (dhcp129-230.brq.redhat.com [10.34.129.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DD31B11F6 for ; Fri, 7 Apr 2017 13:44:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 67AA9C073D4B Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 67AA9C073D4B From: Pavel Hrdina To: libvir-list@redhat.com Date: Fri, 7 Apr 2017 15:44:20 +0200 Message-Id: <4848cb0ccdc83437ede1f12b6ac00226eb7b69b6.1491572622.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/8] tests/testutilsqemu: introduce QEMUBinList with all qemu binaries for tests 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: , MIME-Version: 1.0 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 07 Apr 2017 13:44:44 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Let's group all the binaries that we use in our test suite to one array. Signed-off-by: Pavel Hrdina --- tests/testutilsqemu.c | 56 ++++++++++++++++++++++++++++++++++++++---------= ---- 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index d82cebd578..317bfb7732 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -94,6 +94,31 @@ static virCPUDef cpuPower8Data =3D { .threads =3D 8, }; =20 +typedef enum { + TEST_UTILS_QEMU_BIN_I686_HVM, + TEST_UTILS_QEMU_BIN_I686_KVM, + TEST_UTILS_QEMU_BIN_X86_64_HVM, + TEST_UTILS_QEMU_BIN_X86_64_KVM, + TEST_UTILS_QEMU_BIN_AARCH64_HVM, + TEST_UTILS_QEMU_BIN_ARM_HVM, + TEST_UTILS_QEMU_BIN_PPC64_HVM, + TEST_UTILS_QEMU_BIN_PPC_HVM, + TEST_UTILS_QEMU_BIN_S390X_HVM +} QEMUBinType; + +static const char *QEMUBinList[] =3D { + "/usr/bin/qemu", + "/usr/bin/qemu-kvm", + "/usr/bin/qemu-system-x86_64", + "/usr/bin/kvm", + "/usr/bin/qemu-system-aarch64", + "/usr/bin/qemu-system-arm", + "/usr/bin/qemu-system-ppc64", + "/usr/bin/qemu-system-ppc", + "/usr/bin/qemu-system-s390x" +}; + + static virCapsGuestMachinePtr *testQemuAllocMachines(int *nmachines) { virCapsGuestMachinePtr *machines; @@ -154,7 +179,7 @@ testQemuAddI686Guest(virCapsPtr caps) if (!(guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_I686, - "/usr/bin/qemu", + QEMUBinList[TEST_UTILS_QEMU_BIN_= I686_HVM], NULL, nmachines, machines))) @@ -178,7 +203,7 @@ testQemuAddI686Guest(virCapsPtr caps) =20 if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, - "/usr/bin/qemu-kvm", + QEMUBinList[TEST_UTILS_QEMU_BIN_I68= 6_KVM], NULL, nmachines, machines)) @@ -205,7 +230,7 @@ testQemuAddX86_64Guest(virCapsPtr caps) if (!(guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64, - "/usr/bin/qemu-system-x86_64", + QEMUBinList[TEST_UTILS_QEMU_BIN_= X86_64_HVM], NULL, nmachines, machines))) @@ -229,7 +254,7 @@ testQemuAddX86_64Guest(virCapsPtr caps) =20 if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, - "/usr/bin/kvm", + QEMUBinList[TEST_UTILS_QEMU_BIN_X86= _64_KVM], NULL, nmachines, machines)) @@ -239,7 +264,7 @@ testQemuAddX86_64Guest(virCapsPtr caps) =20 if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, - "/usr/bin/kvm", + QEMUBinList[TEST_UTILS_QEMU_BIN_X86= _64_KVM], NULL, 0, NULL)) @@ -264,8 +289,8 @@ static int testQemuAddPPC64Guest(virCapsPtr caps) goto error; =20 guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARC= H_PPC64, - "/usr/bin/qemu-system-ppc64", NULL, - 1, machines); + QEMUBinList[TEST_UTILS_QEMU_BIN_PPC64_= HVM], + NULL, 1, machines); if (!guest) goto error; =20 @@ -291,8 +316,8 @@ static int testQemuAddPPC64LEGuest(virCapsPtr caps) goto error; =20 guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARC= H_PPC64LE, - "/usr/bin/qemu-system-ppc64", NULL, - 1, machines); + QEMUBinList[TEST_UTILS_QEMU_BIN_PPC64_= HVM], + NULL, 1, machines); if (!guest) goto error; =20 @@ -321,8 +346,8 @@ static int testQemuAddPPCGuest(virCapsPtr caps) goto error; =20 guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARC= H_PPC, - "/usr/bin/qemu-system-ppc", NULL, - 1, machines); + QEMUBinList[TEST_UTILS_QEMU_BIN_PPC_HV= M], + NULL, 1, machines); if (!guest) goto error; =20 @@ -350,7 +375,8 @@ static int testQemuAddS390Guest(virCapsPtr caps) goto error; =20 guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARC= H_S390X, - "/usr/bin/qemu-system-s390x", NULL, + QEMUBinList[TEST_UTILS_QEMU_BIN_S390X_= HVM], + NULL, ARRAY_CARDINALITY(s390_machines), machines); if (!guest) @@ -380,7 +406,8 @@ static int testQemuAddArmGuest(virCapsPtr caps) goto error; =20 guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARC= H_ARMV7L, - "/usr/bin/qemu-system-arm", NULL, + QEMUBinList[TEST_UTILS_QEMU_BIN_ARM_HV= M], + NULL, ARRAY_CARDINALITY(machines), capsmachines); if (!guest) @@ -408,7 +435,8 @@ static int testQemuAddAARCH64Guest(virCapsPtr caps) goto error; =20 guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARC= H_AARCH64, - "/usr/bin/qemu-system-aarch64", NULL, + QEMUBinList[TEST_UTILS_QEMU_BIN_AARCH6= 4_HVM], + NULL, ARRAY_CARDINALITY(machines), capsmachines); if (!guest) --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list