From nobody Sun Feb 8 18:09:14 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 1554713004969824.3432927811169; Mon, 8 Apr 2019 01:43:24 -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 4964D31524FB; Mon, 8 Apr 2019 08:43:23 +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 1D99360FC8; Mon, 8 Apr 2019 08:43:23 +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 CB4053D39D; Mon, 8 Apr 2019 08:43:22 +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 x388gwVp009144 for ; Mon, 8 Apr 2019 04:42:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 19C6D600D4; Mon, 8 Apr 2019 08:42:58 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.188]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BBE006013D for ; Mon, 8 Apr 2019 08:42:55 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id BDC40103643; Mon, 8 Apr 2019 10:42:50 +0200 (CEST) From: Jiri Denemark To: libvir-list@redhat.com Date: Mon, 8 Apr 2019 10:42:14 +0200 Message-Id: <4fdc0f0df7024517311e43bca97b8b9c7f9144ee.1554711784.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 10/36] cpu_x86: Rename x86DataCpuid 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.41]); Mon, 08 Apr 2019 08:43:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" It is now called virCPUx86DataGet. Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- src/cpu/cpu_x86.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 5c2f7900a3..ad5e23843f 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -328,8 +328,8 @@ virCPUx86DataNext(virCPUx86DataIteratorPtr iterator) =20 =20 static virCPUx86DataItemPtr -x86DataCpuid(const virCPUx86Data *data, - const virCPUx86DataItem *item) +virCPUx86DataGet(const virCPUx86Data *data, + const virCPUx86DataItem *item) { size_t i; =20 @@ -385,7 +385,7 @@ virCPUx86DataAddCPUIDInt(virCPUx86Data *data, { virCPUx86DataItemPtr existing; =20 - if ((existing =3D x86DataCpuid(data, item))) { + if ((existing =3D virCPUx86DataGet(data, item))) { x86cpuidSetBits(&existing->cpuid, &item->cpuid); } else { if (VIR_APPEND_ELEMENT_COPY(data->items, data->len, @@ -409,7 +409,7 @@ x86DataAdd(virCPUx86Data *data1, virCPUx86DataItemPtr item2; =20 while ((item2 =3D virCPUx86DataNext(&iter))) { - item1 =3D x86DataCpuid(data1, item2); + item1 =3D virCPUx86DataGet(data1, item2); =20 if (item1) { x86cpuidSetBits(&item1->cpuid, &item2->cpuid); @@ -432,7 +432,7 @@ x86DataSubtract(virCPUx86Data *data1, virCPUx86DataItemPtr item2; =20 while ((item1 =3D virCPUx86DataNext(&iter))) { - if ((item2 =3D x86DataCpuid(data2, item1))) + if ((item2 =3D virCPUx86DataGet(data2, item1))) x86cpuidClearBits(&item1->cpuid, &item2->cpuid); } } @@ -447,7 +447,7 @@ x86DataIntersect(virCPUx86Data *data1, virCPUx86DataItemPtr item2; =20 while ((item1 =3D virCPUx86DataNext(&iter))) { - item2 =3D x86DataCpuid(data2, item1); + item2 =3D virCPUx86DataGet(data2, item1); if (item2) x86cpuidAndBits(&item1->cpuid, &item2->cpuid); else @@ -474,7 +474,7 @@ x86DataIsSubset(const virCPUx86Data *data, const virCPUx86DataItem *itemSubset; =20 while ((itemSubset =3D virCPUx86DataNext(&iter))) { - if (!(item =3D x86DataCpuid(data, itemSubset)) || + if (!(item =3D virCPUx86DataGet(data, itemSubset)) || !x86cpuidMatchMasked(&item->cpuid, &itemSubset->cpuid)) return false; } @@ -515,7 +515,7 @@ x86DataToVendor(const virCPUx86Data *data, =20 for (i =3D 0; i < map->nvendors; i++) { virCPUx86VendorPtr vendor =3D map->vendors[i]; - if ((item =3D x86DataCpuid(data, &vendor->data)) && + if ((item =3D virCPUx86DataGet(data, &vendor->data)) && x86cpuidMatchMasked(&item->cpuid, &vendor->data.cpuid)) { x86cpuidClearBits(&item->cpuid, &vendor->data.cpuid); return vendor; @@ -610,7 +610,7 @@ x86DataToSignatureFull(const virCPUx86Data *data, =20 *family =3D *model =3D *stepping =3D 0; =20 - if (!(item =3D x86DataCpuid(data, &leaf1))) + if (!(item =3D virCPUx86DataGet(data, &leaf1))) return; =20 cpuid =3D &item->cpuid; @@ -629,7 +629,7 @@ x86DataToSignature(const virCPUx86Data *data) virCPUx86DataItem leaf1 =3D CPUID(.eax_in =3D 0x1); virCPUx86DataItemPtr item; =20 - if (!(item =3D x86DataCpuid(data, &leaf1))) + if (!(item =3D virCPUx86DataGet(data, &leaf1))) return 0; =20 return item->cpuid.eax & SIGNATURE_MASK; @@ -1155,7 +1155,7 @@ x86ModelCompare(virCPUx86ModelPtr model1, while ((item1 =3D virCPUx86DataNext(&iter1))) { virCPUx86CompareResult match =3D SUPERSET; =20 - if ((item2 =3D x86DataCpuid(&model2->data, item1))) { + if ((item2 =3D virCPUx86DataGet(&model2->data, item1))) { if (x86cpuidMatch(&item1->cpuid, &item2->cpuid)) continue; else if (!x86cpuidMatchMasked(&item1->cpuid, &item2->cpuid)) @@ -1171,7 +1171,7 @@ x86ModelCompare(virCPUx86ModelPtr model1, while ((item2 =3D virCPUx86DataNext(&iter2))) { virCPUx86CompareResult match =3D SUBSET; =20 - if ((item1 =3D x86DataCpuid(&model1->data, item2))) { + if ((item1 =3D virCPUx86DataGet(&model1->data, item2))) { if (x86cpuidMatch(&item2->cpuid, &item1->cpuid)) continue; else if (!x86cpuidMatchMasked(&item2->cpuid, &item1->cpuid)) @@ -2385,7 +2385,7 @@ cpuidSetLeaf12(virCPUDataPtr data, virCPUx86CPUIDPtr cpuid =3D &item.cpuid; virCPUx86DataItemPtr leaf7; =20 - if (!(leaf7 =3D x86DataCpuid(&data->data.x86, &item)) || + if (!(leaf7 =3D virCPUx86DataGet(&data->data.x86, &item)) || !(leaf7->cpuid.ebx & (1 << 2))) return 0; =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list