From nobody Thu May 15 13:25:59 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 150791894547899.63277566267686; Fri, 13 Oct 2017 11:22:25 -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 297D3883C4; Fri, 13 Oct 2017 18:22:24 +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 038AB183CE; Fri, 13 Oct 2017 18:22:24 +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 BEA2A18355C1; Fri, 13 Oct 2017 18:22:23 +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 v9DIF3DA014057 for ; Fri, 13 Oct 2017 14:15:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2D72E5D6AE; Fri, 13 Oct 2017 18:15:03 +0000 (UTC) Received: from mamuti.net (ovpn-116-29.ams2.redhat.com [10.36.116.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DB53E5D6A4 for ; Fri, 13 Oct 2017 18:15:02 +0000 (UTC) Received: by mamuti.net (Postfix, from userid 500) id 225F61006EF; Fri, 13 Oct 2017 20:14:56 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 297D3883C4 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=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Jiri Denemark To: libvir-list@redhat.com Date: Fri, 13 Oct 2017 20:14:39 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 07/22] conf: Introduce virDomainCapsCPUModelsGet 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.26]); Fri, 13 Oct 2017 18:22:24 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This internal API can be used to find a specific CPU model in virDomainCapsCPUModels list. Signed-off-by: Jiri Denemark Reviewed-by: John Ferlan --- Notes: Version 2: - new patch which replaces the original 07/23 (cpu: Return model from virCPUModelIsAllowed) src/conf/domain_capabilities.c | 18 ++++++++++++++++++ src/conf/domain_capabilities.h | 4 ++++ src/cpu/cpu.c | 8 +------- src/libvirt_private.syms | 1 + 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index be34576204..729d905e2d 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -259,6 +259,24 @@ virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr cp= uModels, } =20 =20 +virDomainCapsCPUModelPtr +virDomainCapsCPUModelsGet(virDomainCapsCPUModelsPtr cpuModels, + const char *name) +{ + size_t i; + + if (!cpuModels) + return NULL; + + for (i =3D 0; i < cpuModels->nmodels; i++) { + if (STREQ(cpuModels->models[i].name, name)) + return cpuModels->models + i; + } + + return NULL; +} + + int virDomainCapsEnumSet(virDomainCapsEnumPtr capsEnum, const char *capsEnumName, diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index 8c71dec21e..07640ed67f 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -179,6 +179,10 @@ int virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPt= r cpuModels, ssize_t nameLen, virDomainCapsCPUUsable usable, char **blockers); +virDomainCapsCPUModelPtr +virDomainCapsCPUModelsGet(virDomainCapsCPUModelsPtr cpuModels, + const char *name); + =20 # define VIR_DOMAIN_CAPS_ENUM_SET(capsEnum, ...) \ do { \ diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index f589666562..047e3b1112 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -829,16 +829,10 @@ bool virCPUModelIsAllowed(const char *model, virDomainCapsCPUModelsPtr models) { - size_t i; - if (!models) return true; =20 - for (i =3D 0; i < models->nmodels; i++) { - if (STREQ(models->models[i].name, model)) - return true; - } - return false; + return !!virDomainCapsCPUModelsGet(models, model); } =20 =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 26c5ddb405..4c56f17e29 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -174,6 +174,7 @@ virDomainCapsCPUModelsAdd; virDomainCapsCPUModelsAddSteal; virDomainCapsCPUModelsCopy; virDomainCapsCPUModelsFilter; +virDomainCapsCPUModelsGet; virDomainCapsCPUModelsNew; virDomainCapsCPUUsableTypeFromString; virDomainCapsCPUUsableTypeToString; --=20 2.14.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list