From nobody Mon Feb 9 10:25:41 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 1537457172056840.3165367812072; Thu, 20 Sep 2018 08:26:12 -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 E72F23091D70; Thu, 20 Sep 2018 15:26:09 +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 8B8407ED92; Thu, 20 Sep 2018 15:26:09 +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 25721181A13B; Thu, 20 Sep 2018 15:26:09 +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 w8KFPjVZ022257 for ; Thu, 20 Sep 2018 11:25:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 52A852010D04; Thu, 20 Sep 2018 15:25:45 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CBDDF2010D02 for ; Thu, 20 Sep 2018 15:25:44 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 20 Sep 2018 17:25:29 +0200 Message-Id: <20180920152529.25973-12-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 11/11] qemu: Prefer qemu-system-* binaries 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.42]); Thu, 20 Sep 2018 15:26:10 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We already prefer them in capabilities, and domcapabilities should be consistent with that. This commit is best viewed with 'git show -w'. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_capabilities.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b621f39a82..77013a818e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -583,6 +583,7 @@ struct _virQEMUCaps { =20 struct virQEMUCapsSearchData { virArch arch; + const char *binaryFilter; }; =20 =20 @@ -4743,7 +4744,15 @@ virQEMUCapsCompareArch(const void *payload, struct virQEMUCapsSearchData *data =3D (struct virQEMUCapsSearchData *= )opaque; const virQEMUCaps *qemuCaps =3D payload; =20 - return qemuCaps->arch =3D=3D data->arch; + if (qemuCaps->arch !=3D data->arch) + return false; + + if (data->binaryFilter && + !strstr(qemuCaps->binary, data->binaryFilter)) { + return false; + } + + return true; } =20 =20 @@ -4752,20 +4761,28 @@ virQEMUCapsCacheLookupByArch(virFileCachePtr cache, virArch arch) { virQEMUCapsPtr ret =3D NULL; + const char *binaryFilters[] =3D { + "qemu-system-", + NULL, + }; virArch archs[] =3D { arch, virQEMUCapsFindTarget(virArchFromHost(), arch), }; + size_t i; size_t j; =20 - for (j =3D 0; j < ARRAY_CARDINALITY(archs); j++) { - struct virQEMUCapsSearchData data =3D { - .arch =3D archs[j], - }; + for (i =3D 0; i < ARRAY_CARDINALITY(binaryFilters); i++) { + for (j =3D 0; j < ARRAY_CARDINALITY(archs); j++) { + struct virQEMUCapsSearchData data =3D { + .arch =3D archs[j], + .binaryFilter =3D binaryFilters[i], + }; =20 - ret =3D virFileCacheLookupByFunc(cache, virQEMUCapsCompareArch, &d= ata); - if (ret) - goto done; + ret =3D virFileCacheLookupByFunc(cache, virQEMUCapsCompareArch= , &data); + if (ret) + goto done; + } } =20 virReportError(VIR_ERR_INVALID_ARG, --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list