From nobody Sat Feb 7 09:29:43 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 1491572680887930.48663030445; Fri, 7 Apr 2017 06:44:40 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 723006AADA; Fri, 7 Apr 2017 13:44:39 +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 483F4A0CBB; Fri, 7 Apr 2017 13:44:39 +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 DFB1418523CC; Fri, 7 Apr 2017 13:44:38 +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 v37DiZZQ027148 for ; Fri, 7 Apr 2017 09:44:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 98D61B11F6; Fri, 7 Apr 2017 13:44:35 +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 1F87BB11FB for ; Fri, 7 Apr 2017 13:44:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 723006AADA Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.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 723006AADA From: Pavel Hrdina To: libvir-list@redhat.com Date: Fri, 7 Apr 2017 15:44:21 +0200 Message-Id: <44d613bc6e6298205d3c247f785c282581567eb3.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 6/8] tests: don't use different QEMU binary paths for different virt types 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 07 Apr 2017 13:44:40 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The virt type for QEMU can be modified by -machine attribute "accel" so there is no need to have different QEMU binary paths. Signed-off-by: Pavel Hrdina --- .../qemuxml2argv-default-kvm-host-arch.args | 2 +- .../qemuxml2xmlout-default-kvm-host-arch.xml | 2 +- tests/testutilsqemu.c | 42 ++++++++++--------= ---- tests/vircapstest.c | 2 +- 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args= b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args index 39195f27de..093af38e08 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args @@ -4,7 +4,7 @@ HOME=3D/home/test \ USER=3Dtest \ LOGNAME=3Dtest \ QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/kvm \ +/usr/bin/qemu-system-x86_64 \ -name kvm \ -S \ -machine pc,accel=3Dkvm \ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.= xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml index 6718df340d..a1af050430 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml @@ -13,7 +13,7 @@ restart destroy - /usr/bin/kvm + /usr/bin/qemu-system-x86_64
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 317bfb7732..d3d62df9d1 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -95,22 +95,18 @@ static virCPUDef cpuPower8Data =3D { }; =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 + TEST_UTILS_QEMU_BIN_I686, + TEST_UTILS_QEMU_BIN_X86_64, + TEST_UTILS_QEMU_BIN_AARCH64, + TEST_UTILS_QEMU_BIN_ARM, + TEST_UTILS_QEMU_BIN_PPC64, + TEST_UTILS_QEMU_BIN_PPC, + TEST_UTILS_QEMU_BIN_S390X } QEMUBinType; =20 static const char *QEMUBinList[] =3D { - "/usr/bin/qemu", - "/usr/bin/qemu-kvm", + "/usr/bin/qemu-system-i686", "/usr/bin/qemu-system-x86_64", - "/usr/bin/kvm", "/usr/bin/qemu-system-aarch64", "/usr/bin/qemu-system-arm", "/usr/bin/qemu-system-ppc64", @@ -179,7 +175,7 @@ testQemuAddI686Guest(virCapsPtr caps) if (!(guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_I686, - QEMUBinList[TEST_UTILS_QEMU_BIN_= I686_HVM], + QEMUBinList[TEST_UTILS_QEMU_BIN_= I686], NULL, nmachines, machines))) @@ -203,7 +199,7 @@ testQemuAddI686Guest(virCapsPtr caps) =20 if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, - QEMUBinList[TEST_UTILS_QEMU_BIN_I68= 6_KVM], + QEMUBinList[TEST_UTILS_QEMU_BIN_I68= 6], NULL, nmachines, machines)) @@ -230,7 +226,7 @@ testQemuAddX86_64Guest(virCapsPtr caps) if (!(guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64, - QEMUBinList[TEST_UTILS_QEMU_BIN_= X86_64_HVM], + QEMUBinList[TEST_UTILS_QEMU_BIN_= X86_64], NULL, nmachines, machines))) @@ -254,7 +250,7 @@ testQemuAddX86_64Guest(virCapsPtr caps) =20 if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, - QEMUBinList[TEST_UTILS_QEMU_BIN_X86= _64_KVM], + QEMUBinList[TEST_UTILS_QEMU_BIN_X86= _64], NULL, nmachines, machines)) @@ -264,7 +260,7 @@ testQemuAddX86_64Guest(virCapsPtr caps) =20 if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, - QEMUBinList[TEST_UTILS_QEMU_BIN_X86= _64_KVM], + QEMUBinList[TEST_UTILS_QEMU_BIN_X86= _64], NULL, 0, NULL)) @@ -289,7 +285,7 @@ static int testQemuAddPPC64Guest(virCapsPtr caps) goto error; =20 guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARC= H_PPC64, - QEMUBinList[TEST_UTILS_QEMU_BIN_PPC64_= HVM], + QEMUBinList[TEST_UTILS_QEMU_BIN_PPC64], NULL, 1, machines); if (!guest) goto error; @@ -316,7 +312,7 @@ static int testQemuAddPPC64LEGuest(virCapsPtr caps) goto error; =20 guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARC= H_PPC64LE, - QEMUBinList[TEST_UTILS_QEMU_BIN_PPC64_= HVM], + QEMUBinList[TEST_UTILS_QEMU_BIN_PPC64], NULL, 1, machines); if (!guest) goto error; @@ -346,7 +342,7 @@ static int testQemuAddPPCGuest(virCapsPtr caps) goto error; =20 guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARC= H_PPC, - QEMUBinList[TEST_UTILS_QEMU_BIN_PPC_HV= M], + QEMUBinList[TEST_UTILS_QEMU_BIN_PPC], NULL, 1, machines); if (!guest) goto error; @@ -375,7 +371,7 @@ static int testQemuAddS390Guest(virCapsPtr caps) goto error; =20 guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARC= H_S390X, - QEMUBinList[TEST_UTILS_QEMU_BIN_S390X_= HVM], + QEMUBinList[TEST_UTILS_QEMU_BIN_S390X], NULL, ARRAY_CARDINALITY(s390_machines), machines); @@ -406,7 +402,7 @@ static int testQemuAddArmGuest(virCapsPtr caps) goto error; =20 guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARC= H_ARMV7L, - QEMUBinList[TEST_UTILS_QEMU_BIN_ARM_HV= M], + QEMUBinList[TEST_UTILS_QEMU_BIN_ARM], NULL, ARRAY_CARDINALITY(machines), capsmachines); @@ -435,7 +431,7 @@ static int testQemuAddAARCH64Guest(virCapsPtr caps) goto error; =20 guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARC= H_AARCH64, - QEMUBinList[TEST_UTILS_QEMU_BIN_AARCH6= 4_HVM], + QEMUBinList[TEST_UTILS_QEMU_BIN_AARCH6= 4], NULL, ARRAY_CARDINALITY(machines), capsmachines); diff --git a/tests/vircapstest.c b/tests/vircapstest.c index bc6362dc4c..95829133d0 100644 --- a/tests/vircapstest.c +++ b/tests/vircapstest.c @@ -234,7 +234,7 @@ test_virCapsDomainDataLookupQEMU(const void *data ATTRI= BUTE_UNUSED) VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-aarch64", "virt"); CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_KVM, NULL, NULL, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64, - VIR_DOMAIN_VIRT_KVM, "/usr/bin/kvm", "pc"); + VIR_DOMAIN_VIRT_KVM, "/usr/bin/qemu-system-x86_64", "pc"); CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, "/usr/bin/qemu-syste= m-ppc64", NULL, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64, VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-ppc64", "pseries"); --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list