From nobody Sun Feb 8 16:05:48 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 1554712995004928.136310364163; Mon, 8 Apr 2019 01:43:15 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5A52A2D7EC; Mon, 8 Apr 2019 08:43:13 +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 2D68C5DA38; Mon, 8 Apr 2019 08:43:13 +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 D5E06181B9EF; Mon, 8 Apr 2019 08:43:12 +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 x388gvS9009113 for ; Mon, 8 Apr 2019 04:42:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id BD5305D721; Mon, 8 Apr 2019 08:42:57 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.188]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 92F6F5D71E for ; Mon, 8 Apr 2019 08:42:55 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id B84CB103642; Mon, 8 Apr 2019 10:42:50 +0200 (CEST) From: Jiri Denemark To: libvir-list@redhat.com Date: Mon, 8 Apr 2019 10:42:13 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 09/36] cpu_x86: Rename x86DataCpuidNext function 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 08 Apr 2019 08:43:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The function is now called virCPUx86DataNext to reflect its purpose: it is an iterator over CPU data (both CPUID and MSR in the near future). Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- src/cpu/cpu_x86.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 6c77b7ce13..5c2f7900a3 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -309,7 +309,7 @@ virCPUx86CPUIDSorter(const void *a, const void *b) =20 /* skips all zero CPUID leaves */ static virCPUx86DataItemPtr -x86DataCpuidNext(virCPUx86DataIteratorPtr iterator) +virCPUx86DataNext(virCPUx86DataIteratorPtr iterator) { const virCPUx86Data *data =3D iterator->data; =20 @@ -408,7 +408,7 @@ x86DataAdd(virCPUx86Data *data1, virCPUx86DataItemPtr item1; virCPUx86DataItemPtr item2; =20 - while ((item2 =3D x86DataCpuidNext(&iter))) { + while ((item2 =3D virCPUx86DataNext(&iter))) { item1 =3D x86DataCpuid(data1, item2); =20 if (item1) { @@ -431,7 +431,7 @@ x86DataSubtract(virCPUx86Data *data1, virCPUx86DataItemPtr item1; virCPUx86DataItemPtr item2; =20 - while ((item1 =3D x86DataCpuidNext(&iter))) { + while ((item1 =3D virCPUx86DataNext(&iter))) { if ((item2 =3D x86DataCpuid(data2, item1))) x86cpuidClearBits(&item1->cpuid, &item2->cpuid); } @@ -446,7 +446,7 @@ x86DataIntersect(virCPUx86Data *data1, virCPUx86DataItemPtr item1; virCPUx86DataItemPtr item2; =20 - while ((item1 =3D x86DataCpuidNext(&iter))) { + while ((item1 =3D virCPUx86DataNext(&iter))) { item2 =3D x86DataCpuid(data2, item1); if (item2) x86cpuidAndBits(&item1->cpuid, &item2->cpuid); @@ -461,7 +461,7 @@ x86DataIsEmpty(virCPUx86Data *data) { virCPUx86DataIterator iter =3D virCPUx86DataIteratorInit(data); =20 - return !x86DataCpuidNext(&iter); + return !virCPUx86DataNext(&iter); } =20 =20 @@ -473,7 +473,7 @@ x86DataIsSubset(const virCPUx86Data *data, const virCPUx86DataItem *item; const virCPUx86DataItem *itemSubset; =20 - while ((itemSubset =3D x86DataCpuidNext(&iter))) { + while ((itemSubset =3D virCPUx86DataNext(&iter))) { if (!(item =3D x86DataCpuid(data, itemSubset)) || !x86cpuidMatchMasked(&item->cpuid, &itemSubset->cpuid)) return false; @@ -1152,7 +1152,7 @@ x86ModelCompare(virCPUx86ModelPtr model1, virCPUx86DataItemPtr item1; virCPUx86DataItemPtr item2; =20 - while ((item1 =3D x86DataCpuidNext(&iter1))) { + while ((item1 =3D virCPUx86DataNext(&iter1))) { virCPUx86CompareResult match =3D SUPERSET; =20 if ((item2 =3D x86DataCpuid(&model2->data, item1))) { @@ -1168,7 +1168,7 @@ x86ModelCompare(virCPUx86ModelPtr model1, return UNRELATED; } =20 - while ((item2 =3D x86DataCpuidNext(&iter2))) { + while ((item2 =3D virCPUx86DataNext(&iter2))) { virCPUx86CompareResult match =3D SUBSET; =20 if ((item1 =3D x86DataCpuid(&model1->data, item2))) { @@ -1462,7 +1462,7 @@ virCPUx86DataFormat(const virCPUData *data) virBuffer buf =3D VIR_BUFFER_INITIALIZER; =20 virBufferAddLit(&buf, "\n"); - while ((item =3D x86DataCpuidNext(&iter))) { + while ((item =3D virCPUx86DataNext(&iter))) { virCPUx86CPUIDPtr cpuid =3D &item->cpuid; virBufferAsprintf(&buf, "