From nobody Sat Feb 7 10:50:25 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.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 1537457152405807.6871604364657; Thu, 20 Sep 2018 08:25:52 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 49F2C74F17; Thu, 20 Sep 2018 15:25:50 +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 0ECF27D65A; Thu, 20 Sep 2018 15:25:50 +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 A38B6181A12F; Thu, 20 Sep 2018 15:25:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w8KFPZ8b022165 for ; Thu, 20 Sep 2018 11:25:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id DEF802010D02; Thu, 20 Sep 2018 15:25:35 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 110432010D0D for ; Thu, 20 Sep 2018 15:25:34 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 20 Sep 2018 17:25:20 +0200 Message-Id: <20180920152529.25973-3-abologna@redhat.com> In-Reply-To: <20180920152529.25973-1-abologna@redhat.com> References: <20180920152529.25973-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/11] qemu: Don't duplicate binary name in capabilities 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 20 Sep 2018 15:25:51 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" virCapabilitiesAddGuestDomain() takes an optional binary name: this is intended for cases where a certain domain type can't use the default one registered for the guest architecture, but has to use a special binary instead. The current code, however, will pass 'binary' again when 'kvmbin' is not defined, which is unnecessary as 'binary' has been registered as default earlier, and will result in capabilities output such as /usr/bin/qemu-system-x86_64 /usr/bin/qemu-system-x86_64 with the second element providing no additional information. Change it so that, when 'kvmbin' is not defined, NULL is passed and so the default emulator will be used instead. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_capabilities.c | 2 +- tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml | 4 +--- 29 files changed, 29 insertions(+), 85 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e14da5acab..88f5b1f34e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -885,7 +885,7 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, =20 if ((dom =3D virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, - kvmbin ? kvmbin : binary, + kvmbin ? kvmbin : NULL, NULL, nmachines, machines)) =3D=3D NULL) { diff --git a/tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml b/tests/qemuca= ps2xmloutdata/caps_1.5.3.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-x86_64 - - /usr/bin/qemu-system-x86_64 - + diff --git a/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml b/tests/qemuca= ps2xmloutdata/caps_1.6.0.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-x86_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 index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-x86_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 index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-x86_64 - - /usr/bin/qemu-system-x86_64 - + diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml b/tests/qemu= caps2xmloutdata/caps_2.10.0.aarch64.xml index a879d67df3..f6572c8ecd 100644 --- a/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-aarch64 - - /usr/bin/qemu-system-aarch64 - + diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml b/tests/qemuca= ps2xmloutdata/caps_2.10.0.ppc64.xml index 74eaf3ba0e..85623f3980 100644 --- a/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-ppc64 - - /usr/bin/qemu-system-ppc64 - + diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml b/tests/qemuca= ps2xmloutdata/caps_2.10.0.s390x.xml index 20ef995d62..bb82a15040 100644 --- a/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml +++ b/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-s390x - - /usr/bin/qemu-system-s390x - + diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml b/tests/qemuc= aps2xmloutdata/caps_2.10.0.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-x86_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 index 20ef995d62..bb82a15040 100644 --- a/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml +++ b/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-s390x - - /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 index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-x86_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 index a879d67df3..f6572c8ecd 100644 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-aarch64 - - /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 index 74eaf3ba0e..85623f3980 100644 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-ppc64 - - /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 index 20ef995d62..bb82a15040 100644 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml +++ b/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-s390x - - /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 index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-x86_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 index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-x86_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 index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-x86_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 index a879d67df3..f6572c8ecd 100644 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-aarch64 - - /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 index 74eaf3ba0e..85623f3980 100644 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-ppc64 - - /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 index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-x86_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 index 20ef995d62..bb82a15040 100644 --- a/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml +++ b/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-s390x - - /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 index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-x86_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 index 20ef995d62..bb82a15040 100644 --- a/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml +++ b/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-s390x - - /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 index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-x86_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 index 74eaf3ba0e..85623f3980 100644 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-ppc64 - - /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 index 20ef995d62..bb82a15040 100644 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml +++ b/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-s390x - - /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 index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-x86_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 index 74eaf3ba0e..85623f3980 100644 --- a/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-ppc64 - - /usr/bin/qemu-system-ppc64 - + diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml b/tests/qemuca= ps2xmloutdata/caps_3.0.0.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml @@ -14,9 +14,7 @@ 64 /usr/bin/qemu-system-x86_64 - - /usr/bin/qemu-system-x86_64 - + --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list