From nobody Tue May 13 14:13:47 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; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=yadro.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1540046552208209.3984615977496; Sat, 20 Oct 2018 07:42:32 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9B8198667B; Sat, 20 Oct 2018 14:42:30 +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 684177958E; Sat, 20 Oct 2018 14:42:30 +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 1F7734CA94; Sat, 20 Oct 2018 14:42:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w9KEKusH012273 for ; Sat, 20 Oct 2018 10:20:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id F41F170461; Sat, 20 Oct 2018 14:20:56 +0000 (UTC) Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EC8576F441 for ; Sat, 20 Oct 2018 14:20:53 +0000 (UTC) Received: from mta-01.yadro.com (mta-01.yadro.com [89.207.88.251]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 04924C05093A for ; Sat, 20 Oct 2018 14:20:52 +0000 (UTC) Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 307F9418F9 for ; Sat, 20 Oct 2018 14:20:50 +0000 (UTC) Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FTwBGYHe3bqO for ; Sat, 20 Oct 2018 17:20:49 +0300 (MSK) Received: from T-EXCH-02.corp.yadro.com (t-exch-02.corp.yadro.com [172.17.10.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id 4AD7841206 for ; Sat, 20 Oct 2018 17:20:49 +0300 (MSK) Received: from localhost (172.17.128.60) by T-EXCH-02.corp.yadro.com (172.17.10.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Sat, 20 Oct 2018 17:20:48 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-type:content-type:mime-version:references:in-reply-to :x-mailer:message-id:date:date:subject:subject:from:from :received:received:received; s=mta-01; t=1540045249; x= 1541859650; bh=vPYLHENt1uYBcUobqc1mj1Axnj9TIwJ6sGFYGF85o+A=; b=N WeUE7nNvgkqk8FBMpLdLQH6z+EKqvCheqLswl0pbR/iwNLMMB2onpKwddbukssnn FwdWagBqayqC1lxKMugvPm9ZBNxz34A1fUt6eaTRFax4bGQW8jj8fXtl5+eCHAR3 mxwmFH7qRFWQ8kPXVHbjPFtS7TpDINnaKa4JLNMSss= X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Date: Sat, 20 Oct 2018 17:19:50 +0300 Message-ID: <20181020141958.59397-6-r.bolshakov@yadro.com> In-Reply-To: <20181020141958.59397-1-r.bolshakov@yadro.com> References: <20181020141958.59397-1-r.bolshakov@yadro.com> MIME-Version: 1.0 X-Originating-IP: [172.17.128.60] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-02.corp.yadro.com (172.17.10.102) X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 216 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Sat, 20 Oct 2018 14:20:52 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Sat, 20 Oct 2018 14:20:52 +0000 (UTC) for IP:'89.207.88.251' DOMAIN:'mta-01.yadro.com' HELO:'mta-01.yadro.com' FROM:'r.bolshakov@yadro.com' RCPT:'' X-RedHat-Spam-Score: -0.111 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_NONE, SPF_PASS) 89.207.88.251 mta-01.yadro.com 89.207.88.251 mta-01.yadro.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.31 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Roman Bolshakov Subject: [libvirt] [PATCH 05/13] qemu: Rename kvmCPU to accelCPU 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Sat, 20 Oct 2018 14:42:31 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" QEMU supports a number of accelerators. It'd be good to have more generic name for kvmCPUModels and kvmCPU. Signed-off-by: Roman Bolshakov --- src/qemu/qemu_capabilities.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b3bfe500e2..4dac040246 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -571,7 +571,7 @@ struct _virQEMUCaps { =20 virArch arch; =20 - virDomainCapsCPUModelsPtr kvmCPUModels; + virDomainCapsCPUModelsPtr accelCPUModels; virDomainCapsCPUModelsPtr tcgCPUModels; =20 size_t nmachineTypes; @@ -582,7 +582,7 @@ struct _virQEMUCaps { =20 virSEVCapability *sevCapabilities; =20 - virQEMUCapsHostCPUData kvmCPU; + virQEMUCapsHostCPUData accelCPU; virQEMUCapsHostCPUData tcgCPU; }; =20 @@ -1546,9 +1546,9 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemu= Caps) =20 ret->arch =3D qemuCaps->arch; =20 - if (qemuCaps->kvmCPUModels) { - ret->kvmCPUModels =3D virDomainCapsCPUModelsCopy(qemuCaps->kvmCPUM= odels); - if (!ret->kvmCPUModels) + if (qemuCaps->accelCPUModels) { + ret->accelCPUModels =3D virDomainCapsCPUModelsCopy(qemuCaps->accel= CPUModels); + if (!ret->accelCPUModels) goto error; } =20 @@ -1558,7 +1558,7 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemu= Caps) goto error; } =20 - if (virQEMUCapsHostCPUDataCopy(&ret->kvmCPU, &qemuCaps->kvmCPU) < 0 || + if (virQEMUCapsHostCPUDataCopy(&ret->accelCPU, &qemuCaps->accelCPU) < = 0 || virQEMUCapsHostCPUDataCopy(&ret->tcgCPU, &qemuCaps->tcgCPU) < 0) goto error; =20 @@ -1605,7 +1605,7 @@ void virQEMUCapsDispose(void *obj) } VIR_FREE(qemuCaps->machineTypes); =20 - virObjectUnref(qemuCaps->kvmCPUModels); + virObjectUnref(qemuCaps->accelCPUModels); virObjectUnref(qemuCaps->tcgCPUModels); =20 virBitmapFree(qemuCaps->flags); @@ -1618,7 +1618,7 @@ void virQEMUCapsDispose(void *obj) =20 virSEVCapabilitiesFree(qemuCaps->sevCapabilities); =20 - virQEMUCapsHostCPUDataClear(&qemuCaps->kvmCPU); + virQEMUCapsHostCPUDataClear(&qemuCaps->accelCPU); virQEMUCapsHostCPUDataClear(&qemuCaps->tcgCPU); } =20 @@ -1772,8 +1772,8 @@ virQEMUCapsAddCPUDefinitions(virQEMUCapsPtr qemuCaps, size_t i; virDomainCapsCPUModelsPtr cpus =3D NULL; =20 - if (type =3D=3D VIR_DOMAIN_VIRT_KVM && qemuCaps->kvmCPUModels) - cpus =3D qemuCaps->kvmCPUModels; + if (type =3D=3D VIR_DOMAIN_VIRT_KVM && qemuCaps->accelCPUModels) + cpus =3D qemuCaps->accelCPUModels; else if (type =3D=3D VIR_DOMAIN_VIRT_QEMU && qemuCaps->tcgCPUModels) cpus =3D qemuCaps->tcgCPUModels; =20 @@ -1782,7 +1782,7 @@ virQEMUCapsAddCPUDefinitions(virQEMUCapsPtr qemuCaps, return -1; =20 if (type =3D=3D VIR_DOMAIN_VIRT_KVM) - qemuCaps->kvmCPUModels =3D cpus; + qemuCaps->accelCPUModels =3D cpus; else qemuCaps->tcgCPUModels =3D cpus; } @@ -1801,7 +1801,7 @@ virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCaps, virDomainVirtType type) { if (type =3D=3D VIR_DOMAIN_VIRT_KVM) - return qemuCaps->kvmCPUModels; + return qemuCaps->accelCPUModels; else return qemuCaps->tcgCPUModels; } @@ -1812,7 +1812,7 @@ virQEMUCapsGetHostCPUData(virQEMUCapsPtr qemuCaps, virDomainVirtType type) { if (type =3D=3D VIR_DOMAIN_VIRT_KVM) - return &qemuCaps->kvmCPU; + return &qemuCaps->accelCPU; else return &qemuCaps->tcgCPU; } @@ -1876,7 +1876,7 @@ virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps, =20 case VIR_CPU_MODE_CUSTOM: if (type =3D=3D VIR_DOMAIN_VIRT_KVM) - cpus =3D qemuCaps->kvmCPUModels; + cpus =3D qemuCaps->accelCPUModels; else cpus =3D qemuCaps->tcgCPUModels; return cpus && cpus->nmodels > 0; @@ -2363,7 +2363,7 @@ virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemu= Caps, if (tcg || !virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) qemuCaps->tcgCPUModels =3D models; else - qemuCaps->kvmCPUModels =3D models; + qemuCaps->accelCPUModels =3D models; =20 return 0; } @@ -3204,7 +3204,7 @@ virQEMUCapsLoadCPUModels(virQEMUCapsPtr qemuCaps, goto cleanup; =20 if (type =3D=3D VIR_DOMAIN_VIRT_KVM) - qemuCaps->kvmCPUModels =3D cpus; + qemuCaps->accelCPUModels =3D cpus; else qemuCaps->tcgCPUModels =3D cpus; =20 @@ -3679,7 +3679,7 @@ virQEMUCapsFormatCPUModels(virQEMUCapsPtr qemuCaps, =20 if (type =3D=3D VIR_DOMAIN_VIRT_KVM) { typeStr =3D "kvm"; - cpus =3D qemuCaps->kvmCPUModels; + cpus =3D qemuCaps->accelCPUModels; } else { typeStr =3D "tcg"; cpus =3D qemuCaps->tcgCPUModels; @@ -5073,7 +5073,7 @@ virQEMUCapsFillDomainCPUCaps(virCapsPtr caps, virDomainCapsCPUModelsPtr cpus; =20 if (domCaps->virttype =3D=3D VIR_DOMAIN_VIRT_KVM) - cpus =3D qemuCaps->kvmCPUModels; + cpus =3D qemuCaps->accelCPUModels; else cpus =3D qemuCaps->tcgCPUModels; =20 --=20 2.17.1 (Apple Git-112) -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list