From nobody Fri Dec 19 02:50:51 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571153832; cv=none; d=zoho.com; s=zohoarc; b=nlhpnnHZZ6Ok3EuXyqKo/zdZeUT8ANYN5qr2h7g3bMqIaAa7r50o+O/pdOiieMAwoTYSg9GQs8SqNmtT9s1pCYiZ3lKpLiEyLtg6e9sGiJ500HAu0fpqrudRQS60hdP3jm9p3xoBwxJlWNdMjVbcR65Yok0l/0Rq3oyswEkl1Z4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571153832; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ReujcpnB8IkKThUBkBzNQl35RiHsAwfNH/UPIJ4zYA0=; b=Y/nzFhN6YqzD+9cnDcxVN7J3mlI0WuntwTyRhsPXBVOs8UEPoH46JWo18oQ8b1DGXkfJuvbDJC94GKI9HV4DuoXz+o13NL/iBFAG8iO9AWJ07Mki4vJzhY+8wMUMsyOi7rnUEWlup/xcNZsKlK2sbyNHizdHUOuSiiOQyYkMV8o= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1571153832604967.9926480662208; Tue, 15 Oct 2019 08:37: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 A270D3086E21; Tue, 15 Oct 2019 15:37:10 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7685160C57; Tue, 15 Oct 2019 15:37:10 +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 3300A244FB; Tue, 15 Oct 2019 15:37:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9FFZGBf024655 for ; Tue, 15 Oct 2019 11:35:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 549BA60C5E; Tue, 15 Oct 2019 15:35:16 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.188]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 29E0D60BE2 for ; Tue, 15 Oct 2019 15:35:16 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 79354101CDC; Tue, 15 Oct 2019 17:35:09 +0200 (CEST) From: Jiri Denemark To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 17:34:51 +0200 Message-Id: <5739e8eba52933c1acb85d9ea28966ca25ca4207.1571152057.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 15/31] qemu: Introduce virQEMUCapsCPUDefsToModels 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: , 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.44]); Tue, 15 Oct 2019 15:37:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The function translates qemuMonitorCPUDefsPtr (used by QEMU caps probing code) into virDomainCapsCPUModelsPtr used by domain capabilities. Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- Notes: Version 2: - trivial rebase src/qemu/qemu_capabilities.c | 71 +++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e38ad03ab5..87ac9bacdc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1887,6 +1887,41 @@ virQEMUCapsAddCPUDefinitions(virQEMUCapsPtr qemuCaps, } =20 =20 +static virDomainCapsCPUModelsPtr +virQEMUCapsCPUDefsToModels(qemuMonitorCPUDefsPtr defs, + const char **modelWhitelist, + const char **modelBlacklist) +{ + VIR_AUTOUNREF(virDomainCapsCPUModelsPtr) cpuModels =3D NULL; + size_t i; + + if (!(cpuModels =3D virDomainCapsCPUModelsNew(defs->ncpus))) + return NULL; + + for (i =3D 0; i < defs->ncpus; i++) { + qemuMonitorCPUDefInfoPtr cpu =3D defs->cpus + i; + virDomainCapsCPUUsable usable =3D VIR_DOMCAPS_CPU_USABLE_UNKNOWN; + + if (modelWhitelist && !virStringListHasString(modelWhitelist, cpu-= >name)) + continue; + + if (modelBlacklist && virStringListHasString(modelBlacklist, cpu->= name)) + continue; + + if (cpu->usable =3D=3D VIR_TRISTATE_BOOL_YES) + usable =3D VIR_DOMCAPS_CPU_USABLE_YES; + else if (cpu->usable =3D=3D VIR_TRISTATE_BOOL_NO) + usable =3D VIR_DOMCAPS_CPU_USABLE_NO; + + if (virDomainCapsCPUModelsAdd(cpuModels, cpu->name, + usable, cpu->blockers) < 0) + return NULL; + } + + VIR_RETURN_PTR(cpuModels); +} + + virDomainCapsCPUModelsPtr virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCaps, virDomainVirtType type, @@ -2458,19 +2493,15 @@ virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon, virDomainCapsCPUModelsPtr *cpuModels) { VIR_AUTOPTR(qemuMonitorCPUDefs) defs =3D NULL; - virDomainCapsCPUModelsPtr models =3D NULL; size_t i; - int ret =3D -1; =20 *cpuModels =3D NULL; =20 if (qemuMonitorGetCPUDefinitions(mon, &defs) < 0) return -1; =20 - if (!defs) { - ret =3D 0; - goto cleanup; - } + if (!defs) + return 0; =20 /* QEMU 2.11 for Power renamed all CPU models to lower case, we need to * translate them back to libvirt's upper case model names. */ @@ -2479,7 +2510,7 @@ virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon, char **name; =20 if (virCPUGetModels(arch, &libvirtModels) < 0) - goto cleanup; + return -1; =20 for (name =3D libvirtModels; name && *name; name++) { for (i =3D 0; i < defs->ncpus; i++) { @@ -2488,33 +2519,15 @@ virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon, =20 VIR_FREE(defs->cpus[i].name); if (VIR_STRDUP(defs->cpus[i].name, *name) < 0) - goto cleanup; + return -1; } } } =20 - if (!(models =3D virDomainCapsCPUModelsNew(defs->ncpus))) - goto cleanup; - - for (i =3D 0; i < defs->ncpus; i++) { - virDomainCapsCPUUsable usable =3D VIR_DOMCAPS_CPU_USABLE_UNKNOWN; - - if (defs->cpus[i].usable =3D=3D VIR_TRISTATE_BOOL_YES) - usable =3D VIR_DOMCAPS_CPU_USABLE_YES; - else if (defs->cpus[i].usable =3D=3D VIR_TRISTATE_BOOL_NO) - usable =3D VIR_DOMCAPS_CPU_USABLE_NO; - - if (virDomainCapsCPUModelsAddSteal(models, &defs->cpus[i].name, us= able, - &defs->cpus[i].blockers) < 0) - goto cleanup; - } - - VIR_STEAL_PTR(*cpuModels, models); - ret =3D 0; + if (!(*cpuModels =3D virQEMUCapsCPUDefsToModels(defs, NULL, NULL))) + return -1; =20 - cleanup: - virObjectUnref(models); - return ret; + return 0; } =20 =20 --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list