From 99431463aaf37298bc90f82bc6b20b44f4853246 Mon Sep 17 00:00:00 2001

Message-Id: <99431463aaf37298bc90f82bc6b20b44f4853246@dist-git>

From: Jiri Denemark <jdenemar@redhat.com>

Date: Fri, 21 Jun 2019 09:25:26 +0200

Subject: [PATCH] cpu_x86: Rename x86DataCpuid

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

It is now called virCPUx86DataGet.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

(cherry picked from commit 609f467f1377da3418dad23fdd9f7136e462ba5b)

https://bugzilla.redhat.com/show_bug.cgi?id=1697627

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

Message-Id: <427e52b2993356d0170e2f756526e9d523686a42.1561068591.git.jdenemar@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

---

 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 d9475e5b4a..52709f109e 100644

--- a/src/cpu/cpu_x86.c

+++ b/src/cpu/cpu_x86.c

@@ -326,8 +326,8 @@ virCPUx86DataNext(virCPUx86DataIteratorPtr iterator)

 static virCPUx86DataItemPtr

-x86DataCpuid(const virCPUx86Data *data,

-             const virCPUx86DataItem *item)

+virCPUx86DataGet(const virCPUx86Data *data,

+                 const virCPUx86DataItem *item)

 {

     size_t i;

@@ -383,7 +383,7 @@ virCPUx86DataAddCPUIDInt(virCPUx86Data *data,

 {

     virCPUx86DataItemPtr existing;

-    if ((existing = x86DataCpuid(data, item))) {

+    if ((existing = virCPUx86DataGet(data, item))) {

         x86cpuidSetBits(&existing->cpuid, &item->cpuid);

     } else {

         if (VIR_APPEND_ELEMENT_COPY(data->items, data->len,

@@ -407,7 +407,7 @@ x86DataAdd(virCPUx86Data *data1,

     virCPUx86DataItemPtr item2;

     while ((item2 = virCPUx86DataNext(&iter))) {

-        item1 = x86DataCpuid(data1, item2);

+        item1 = virCPUx86DataGet(data1, item2);

         if (item1) {

             x86cpuidSetBits(&item1->cpuid, &item2->cpuid);

@@ -430,7 +430,7 @@ x86DataSubtract(virCPUx86Data *data1,

     virCPUx86DataItemPtr item2;

     while ((item1 = virCPUx86DataNext(&iter))) {

-        if ((item2 = x86DataCpuid(data2, item1)))

+        if ((item2 = virCPUx86DataGet(data2, item1)))

             x86cpuidClearBits(&item1->cpuid, &item2->cpuid);

     }

 }

@@ -445,7 +445,7 @@ x86DataIntersect(virCPUx86Data *data1,

     virCPUx86DataItemPtr item2;

     while ((item1 = virCPUx86DataNext(&iter))) {

-        item2 = x86DataCpuid(data2, item1);

+        item2 = virCPUx86DataGet(data2, item1);

         if (item2)

             x86cpuidAndBits(&item1->cpuid, &item2->cpuid);

         else

@@ -473,7 +473,7 @@ x86DataIsSubset(const virCPUx86Data *data,

     const virCPUx86DataItem *itemSubset;

     while ((itemSubset = virCPUx86DataNext(&iter))) {

-        if (!(item = x86DataCpuid(data, itemSubset)) ||

+        if (!(item = virCPUx86DataGet(data, itemSubset)) ||

             !x86cpuidMatchMasked(&item->cpuid, &itemSubset->cpuid))

             return false;

     }

@@ -514,7 +514,7 @@ x86DataToVendor(const virCPUx86Data *data,

     for (i = 0; i < map->nvendors; i++) {

         virCPUx86VendorPtr vendor = map->vendors[i];

-        if ((item = x86DataCpuid(data, &vendor->data)) &&

+        if ((item = virCPUx86DataGet(data, &vendor->data)) &&

             x86cpuidMatchMasked(&item->cpuid, &vendor->data.cpuid)) {

             x86cpuidClearBits(&item->cpuid, &vendor->data.cpuid);

             return vendor;

@@ -609,7 +609,7 @@ x86DataToSignatureFull(const virCPUx86Data *data,

     *family = *model = *stepping = 0;

-    if (!(item = x86DataCpuid(data, &leaf1)))

+    if (!(item = virCPUx86DataGet(data, &leaf1)))

         return;

     cpuid = &item->cpuid;

@@ -628,7 +628,7 @@ x86DataToSignature(const virCPUx86Data *data)

     virCPUx86DataItem leaf1 = CPUID(.eax_in = 0x1);

     virCPUx86DataItemPtr item;

-    if (!(item = x86DataCpuid(data, &leaf1)))

+    if (!(item = virCPUx86DataGet(data, &leaf1)))

         return 0;

     return item->cpuid.eax & SIGNATURE_MASK;

@@ -1154,7 +1154,7 @@ x86ModelCompare(virCPUx86ModelPtr model1,

     while ((item1 = virCPUx86DataNext(&iter1))) {

         virCPUx86CompareResult match = SUPERSET;

-        if ((item2 = x86DataCpuid(&model2->data, item1))) {

+        if ((item2 = virCPUx86DataGet(&model2->data, item1))) {

             if (x86cpuidMatch(&item1->cpuid, &item2->cpuid))

                 continue;

             else if (!x86cpuidMatchMasked(&item1->cpuid, &item2->cpuid))

@@ -1170,7 +1170,7 @@ x86ModelCompare(virCPUx86ModelPtr model1,

     while ((item2 = virCPUx86DataNext(&iter2))) {

         virCPUx86CompareResult match = SUBSET;

-        if ((item1 = x86DataCpuid(&model1->data, item2))) {

+        if ((item1 = virCPUx86DataGet(&model1->data, item2))) {

             if (x86cpuidMatch(&item2->cpuid, &item1->cpuid))

                 continue;

             else if (!x86cpuidMatchMasked(&item2->cpuid, &item1->cpuid))

@@ -2384,7 +2384,7 @@ cpuidSetLeaf12(virCPUDataPtr data,

     virCPUx86CPUIDPtr cpuid = &item.cpuid;

     virCPUx86DataItemPtr leaf7;

-    if (!(leaf7 = x86DataCpuid(&data->data.x86, &item)) ||

+    if (!(leaf7 = virCPUx86DataGet(&data->data.x86, &item)) ||

         !(leaf7->cpuid.ebx & (1 << 2)))

         return 0;

-- 

2.22.0