From nobody Sun Feb 8 13:17:10 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 1554712986392829.211281861485; Mon, 8 Apr 2019 01:43:06 -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 718FD883B8; Mon, 8 Apr 2019 08:43:04 +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 3D7DF63B86; Mon, 8 Apr 2019 08:43:04 +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 E3CE13FB30; Mon, 8 Apr 2019 08:43:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x388gtcG009071 for ; Mon, 8 Apr 2019 04:42:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id E7A48665C8; Mon, 8 Apr 2019 08:42:55 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.188]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9622760A9E for ; Mon, 8 Apr 2019 08:42:55 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id B2B85103641; Mon, 8 Apr 2019 10:42:50 +0200 (CEST) From: Jiri Denemark To: libvir-list@redhat.com Date: Mon, 8 Apr 2019 10:42:12 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 08/36] cpu_x86: Rename virCPUx86DataItem variables 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]); Mon, 08 Apr 2019 08:43:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- src/cpu/cpu_x86.c | 128 +++++++++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 8a10c237e9..6c77b7ce13 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -329,13 +329,13 @@ x86DataCpuidNext(virCPUx86DataIteratorPtr iterator) =20 static virCPUx86DataItemPtr x86DataCpuid(const virCPUx86Data *data, - const virCPUx86DataItem *cpuid) + const virCPUx86DataItem *item) { size_t i; =20 for (i =3D 0; i < data->len; i++) { - if (data->items[i].cpuid.eax_in =3D=3D cpuid->cpuid.eax_in && - data->items[i].cpuid.ecx_in =3D=3D cpuid->cpuid.ecx_in) + if (data->items[i].cpuid.eax_in =3D=3D item->cpuid.eax_in && + data->items[i].cpuid.ecx_in =3D=3D item->cpuid.ecx_in) return data->items + i; } =20 @@ -381,15 +381,15 @@ x86DataCopy(virCPUx86Data *dst, const virCPUx86Data *= src) =20 static int virCPUx86DataAddCPUIDInt(virCPUx86Data *data, - const virCPUx86DataItem *cpuid) + const virCPUx86DataItem *item) { virCPUx86DataItemPtr existing; =20 - if ((existing =3D x86DataCpuid(data, cpuid))) { - x86cpuidSetBits(&existing->cpuid, &cpuid->cpuid); + if ((existing =3D x86DataCpuid(data, item))) { + x86cpuidSetBits(&existing->cpuid, &item->cpuid); } else { if (VIR_APPEND_ELEMENT_COPY(data->items, data->len, - *((virCPUx86DataItemPtr)cpuid)) < 0) + *((virCPUx86DataItemPtr)item)) < 0) return -1; =20 qsort(data->items, data->len, @@ -405,16 +405,16 @@ x86DataAdd(virCPUx86Data *data1, const virCPUx86Data *data2) { virCPUx86DataIterator iter =3D virCPUx86DataIteratorInit(data2); - virCPUx86DataItemPtr cpuid1; - virCPUx86DataItemPtr cpuid2; + virCPUx86DataItemPtr item1; + virCPUx86DataItemPtr item2; =20 - while ((cpuid2 =3D x86DataCpuidNext(&iter))) { - cpuid1 =3D x86DataCpuid(data1, cpuid2); + while ((item2 =3D x86DataCpuidNext(&iter))) { + item1 =3D x86DataCpuid(data1, item2); =20 - if (cpuid1) { - x86cpuidSetBits(&cpuid1->cpuid, &cpuid2->cpuid); + if (item1) { + x86cpuidSetBits(&item1->cpuid, &item2->cpuid); } else { - if (virCPUx86DataAddCPUIDInt(data1, cpuid2) < 0) + if (virCPUx86DataAddCPUIDInt(data1, item2) < 0) return -1; } } @@ -428,12 +428,12 @@ x86DataSubtract(virCPUx86Data *data1, const virCPUx86Data *data2) { virCPUx86DataIterator iter =3D virCPUx86DataIteratorInit(data1); - virCPUx86DataItemPtr cpuid1; - virCPUx86DataItemPtr cpuid2; + virCPUx86DataItemPtr item1; + virCPUx86DataItemPtr item2; =20 - while ((cpuid1 =3D x86DataCpuidNext(&iter))) { - if ((cpuid2 =3D x86DataCpuid(data2, cpuid1))) - x86cpuidClearBits(&cpuid1->cpuid, &cpuid2->cpuid); + while ((item1 =3D x86DataCpuidNext(&iter))) { + if ((item2 =3D x86DataCpuid(data2, item1))) + x86cpuidClearBits(&item1->cpuid, &item2->cpuid); } } =20 @@ -443,15 +443,15 @@ x86DataIntersect(virCPUx86Data *data1, const virCPUx86Data *data2) { virCPUx86DataIterator iter =3D virCPUx86DataIteratorInit(data1); - virCPUx86DataItemPtr cpuid1; - virCPUx86DataItemPtr cpuid2; + virCPUx86DataItemPtr item1; + virCPUx86DataItemPtr item2; =20 - while ((cpuid1 =3D x86DataCpuidNext(&iter))) { - cpuid2 =3D x86DataCpuid(data2, cpuid1); - if (cpuid2) - x86cpuidAndBits(&cpuid1->cpuid, &cpuid2->cpuid); + while ((item1 =3D x86DataCpuidNext(&iter))) { + item2 =3D x86DataCpuid(data2, item1); + if (item2) + x86cpuidAndBits(&item1->cpuid, &item2->cpuid); else - x86cpuidClearBits(&cpuid1->cpuid, &cpuid1->cpuid); + x86cpuidClearBits(&item1->cpuid, &item1->cpuid); } } =20 @@ -470,12 +470,12 @@ x86DataIsSubset(const virCPUx86Data *data, const virCPUx86Data *subset) { virCPUx86DataIterator iter =3D virCPUx86DataIteratorInit((virCPUx86Dat= a *)subset); - const virCPUx86DataItem *cpuid; - const virCPUx86DataItem *cpuidSubset; + const virCPUx86DataItem *item; + const virCPUx86DataItem *itemSubset; =20 - while ((cpuidSubset =3D x86DataCpuidNext(&iter))) { - if (!(cpuid =3D x86DataCpuid(data, cpuidSubset)) || - !x86cpuidMatchMasked(&cpuid->cpuid, &cpuidSubset->cpuid)) + while ((itemSubset =3D x86DataCpuidNext(&iter))) { + if (!(item =3D x86DataCpuid(data, itemSubset)) || + !x86cpuidMatchMasked(&item->cpuid, &itemSubset->cpuid)) return false; } =20 @@ -510,14 +510,14 @@ static virCPUx86VendorPtr x86DataToVendor(const virCPUx86Data *data, virCPUx86MapPtr map) { - virCPUx86DataItemPtr cpuid; + virCPUx86DataItemPtr item; size_t i; =20 for (i =3D 0; i < map->nvendors; i++) { virCPUx86VendorPtr vendor =3D map->vendors[i]; - if ((cpuid =3D x86DataCpuid(data, &vendor->data)) && - x86cpuidMatchMasked(&cpuid->cpuid, &vendor->data.cpuid)) { - x86cpuidClearBits(&cpuid->cpuid, &vendor->data.cpuid); + if ((item =3D x86DataCpuid(data, &vendor->data)) && + x86cpuidMatchMasked(&item->cpuid, &vendor->data.cpuid)) { + x86cpuidClearBits(&item->cpuid, &vendor->data.cpuid); return vendor; } } @@ -627,12 +627,12 @@ static uint32_t x86DataToSignature(const virCPUx86Data *data) { virCPUx86DataItem leaf1 =3D CPUID(.eax_in =3D 0x1); - virCPUx86DataItemPtr cpuid; + virCPUx86DataItemPtr item; =20 - if (!(cpuid =3D x86DataCpuid(data, &leaf1))) + if (!(item =3D x86DataCpuid(data, &leaf1))) return 0; =20 - return cpuid->cpuid.eax & SIGNATURE_MASK; + return item->cpuid.eax & SIGNATURE_MASK; } =20 =20 @@ -640,9 +640,9 @@ static int x86DataAddSignature(virCPUx86Data *data, uint32_t signature) { - virCPUx86DataItem cpuid =3D CPUID(.eax_in =3D 0x1, .eax =3D signature); + virCPUx86DataItem leaf1 =3D CPUID(.eax_in =3D 0x1, .eax =3D signature); =20 - return virCPUx86DataAddCPUIDInt(data, &cpuid); + return virCPUx86DataAddCPUIDInt(data, &leaf1); } =20 =20 @@ -906,7 +906,7 @@ x86FeatureParse(xmlXPathContextPtr ctxt, virCPUx86MapPtr map =3D data; xmlNodePtr *nodes =3D NULL; virCPUx86FeaturePtr feature; - virCPUx86DataItem cpuid; + virCPUx86DataItem item; size_t i; int n; char *str =3D NULL; @@ -943,13 +943,13 @@ x86FeatureParse(xmlXPathContextPtr ctxt, =20 for (i =3D 0; i < n; i++) { ctxt->node =3D nodes[i]; - if (x86ParseCPUID(ctxt, &cpuid) < 0) { + if (x86ParseCPUID(ctxt, &item) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid cpuid[%zu] in %s feature"), i, feature->name); goto cleanup; } - if (virCPUx86DataAddCPUIDInt(&feature->data, &cpuid)) + if (virCPUx86DataAddCPUIDInt(&feature->data, &item)) goto cleanup; } =20 @@ -1149,16 +1149,16 @@ x86ModelCompare(virCPUx86ModelPtr model1, virCPUx86CompareResult result =3D EQUAL; virCPUx86DataIterator iter1 =3D virCPUx86DataIteratorInit(&model1->dat= a); virCPUx86DataIterator iter2 =3D virCPUx86DataIteratorInit(&model2->dat= a); - virCPUx86DataItemPtr cpuid1; - virCPUx86DataItemPtr cpuid2; + virCPUx86DataItemPtr item1; + virCPUx86DataItemPtr item2; =20 - while ((cpuid1 =3D x86DataCpuidNext(&iter1))) { + while ((item1 =3D x86DataCpuidNext(&iter1))) { virCPUx86CompareResult match =3D SUPERSET; =20 - if ((cpuid2 =3D x86DataCpuid(&model2->data, cpuid1))) { - if (x86cpuidMatch(&cpuid1->cpuid, &cpuid2->cpuid)) + if ((item2 =3D x86DataCpuid(&model2->data, item1))) { + if (x86cpuidMatch(&item1->cpuid, &item2->cpuid)) continue; - else if (!x86cpuidMatchMasked(&cpuid1->cpuid, &cpuid2->cpuid)) + else if (!x86cpuidMatchMasked(&item1->cpuid, &item2->cpuid)) match =3D SUBSET; } =20 @@ -1168,13 +1168,13 @@ x86ModelCompare(virCPUx86ModelPtr model1, return UNRELATED; } =20 - while ((cpuid2 =3D x86DataCpuidNext(&iter2))) { + while ((item2 =3D x86DataCpuidNext(&iter2))) { virCPUx86CompareResult match =3D SUBSET; =20 - if ((cpuid1 =3D x86DataCpuid(&model1->data, cpuid2))) { - if (x86cpuidMatch(&cpuid2->cpuid, &cpuid1->cpuid)) + if ((item1 =3D x86DataCpuid(&model1->data, item2))) { + if (x86cpuidMatch(&item2->cpuid, &item1->cpuid)) continue; - else if (!x86cpuidMatchMasked(&cpuid2->cpuid, &cpuid1->cpuid)) + else if (!x86cpuidMatchMasked(&item2->cpuid, &item1->cpuid)) match =3D SUPERSET; } =20 @@ -1485,7 +1485,7 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt) { xmlNodePtr *nodes =3D NULL; virCPUDataPtr cpuData =3D NULL; - virCPUx86DataItem cpuid; + virCPUx86DataItem item; size_t i; int n; =20 @@ -1501,12 +1501,12 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt) =20 for (i =3D 0; i < n; i++) { ctxt->node =3D nodes[i]; - if (x86ParseCPUID(ctxt, &cpuid) < 0) { + if (x86ParseCPUID(ctxt, &item) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to parse cpuid[%zu]"), i); goto error; } - if (virCPUx86DataAddCPUID(cpuData, &cpuid) < 0) + if (virCPUx86DataAddCPUID(cpuData, &item) < 0) goto error; } =20 @@ -2383,10 +2383,10 @@ cpuidSetLeaf12(virCPUDataPtr data, { virCPUx86DataItem item =3D CPUID(.eax_in =3D 0x7); virCPUx86CPUIDPtr cpuid =3D &item.cpuid; - virCPUx86DataItemPtr cpuid7; + virCPUx86DataItemPtr leaf7; =20 - if (!(cpuid7 =3D x86DataCpuid(&data->data.x86, &item)) || - !(cpuid7->cpuid.ebx & (1 << 2))) + if (!(leaf7 =3D x86DataCpuid(&data->data.x86, &item)) || + !(leaf7->cpuid.ebx & (1 << 2))) return 0; =20 if (virCPUx86DataAddCPUID(data, subLeaf0) < 0) @@ -3079,9 +3079,9 @@ virCPUx86ValidateFeatures(virCPUDefPtr cpu) =20 int virCPUx86DataAddCPUID(virCPUDataPtr cpuData, - const virCPUx86DataItem *cpuid) + const virCPUx86DataItem *item) { - return virCPUx86DataAddCPUIDInt(&cpuData->data.x86, cpuid); + return virCPUx86DataAddCPUIDInt(&cpuData->data.x86, item); } =20 =20 @@ -3113,12 +3113,12 @@ int virCPUx86DataSetVendor(virCPUDataPtr cpuData, const char *vendor) { - virCPUx86DataItem cpuid =3D CPUID(0); + virCPUx86DataItem item =3D CPUID(0); =20 - if (virCPUx86VendorToCPUID(vendor, &cpuid) < 0) + if (virCPUx86VendorToCPUID(vendor, &item) < 0) return -1; =20 - return virCPUx86DataAddCPUID(cpuData, &cpuid); + return virCPUx86DataAddCPUID(cpuData, &item); } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list