From 39da1d7fe9d2bd12c10c40de62c36724556797be Mon Sep 17 00:00:00 2001

Message-Id: <39da1d7fe9d2bd12c10c40de62c36724556797be@dist-git>

From: Jiri Denemark <jdenemar@redhat.com>

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

Subject: [PATCH] cpu_x86: Rename virCPUx86DataAddCPUIDInt

MIME-Version: 1.0

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

Content-Transfer-Encoding: 8bit

The new name is virCPUx86DataAddItem.

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

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

(cherry picked from commit ce42042577ada2616a7b062f890677f9797c7bf9)

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

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

Message-Id: <631af83ec447522318e8169b0b9ef607b764befa.1561068591.git.jdenemar@redhat.com>

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

---

 src/cpu/cpu_x86.c | 20 ++++++++++----------

 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c

index efb2a3bb07..7e077577d3 100644

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

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

@@ -378,8 +378,8 @@ x86DataCopy(virCPUx86Data *dst, const virCPUx86Data *src)

 static int

-virCPUx86DataAddCPUIDInt(virCPUx86Data *data,

-                         const virCPUx86DataItem *item)

+virCPUx86DataAddItem(virCPUx86Data *data,

+                     const virCPUx86DataItem *item)

 {

     virCPUx86DataItemPtr existing;

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

         if (item1) {

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

         } else {

-            if (virCPUx86DataAddCPUIDInt(data1, item2) < 0)

+            if (virCPUx86DataAddItem(data1, item2) < 0)

                 return -1;

         }

     }

@@ -641,7 +641,7 @@ x86DataAddSignature(virCPUx86Data *data,

 {

     virCPUx86DataItem leaf1 = CPUID(.eax_in = 0x1, .eax = signature);

-    return virCPUx86DataAddCPUIDInt(data, &leaf1);

+    return virCPUx86DataAddItem(data, &leaf1);

 }

@@ -948,7 +948,7 @@ x86FeatureParse(xmlXPathContextPtr ctxt,

                            i, feature->name);

             goto cleanup;

         }

-        if (virCPUx86DataAddCPUIDInt(&feature->data, &item))

+        if (virCPUx86DataAddItem(&feature->data, &item))

             goto cleanup;

     }

@@ -1664,8 +1664,8 @@ x86Compute(virCPUDefPtr host,

             goto error;

         if (cpu->vendor && host_model->vendor &&

-            virCPUx86DataAddCPUIDInt(&guest_model->data,

-                                     &host_model->vendor->data) < 0)

+            virCPUx86DataAddItem(&guest_model->data,

+                                 &host_model->vendor->data) < 0)

             goto error;

         if (host_model->signatures &&

@@ -2650,7 +2650,7 @@ virCPUx86Baseline(virCPUDefPtr *cpus,

     }

     if (vendor &&

-        virCPUx86DataAddCPUIDInt(&base_model->data, &vendor->data) < 0)

+        virCPUx86DataAddItem(&base_model->data, &vendor->data) < 0)

         goto error;

     if (x86Decode(cpu, &base_model->data, models, modelName, migratable) < 0)

@@ -2949,7 +2949,7 @@ virCPUx86Translate(virCPUDefPtr cpu,

         goto cleanup;

     if (model->vendor &&

-        virCPUx86DataAddCPUIDInt(&model->data, &model->vendor->data) < 0)

+        virCPUx86DataAddItem(&model->data, &model->vendor->data) < 0)

         goto cleanup;

     if (model->signatures &&

@@ -3080,7 +3080,7 @@ int

 virCPUx86DataAddCPUID(virCPUDataPtr cpuData,

                       const virCPUx86DataItem *item)

 {

-    return virCPUx86DataAddCPUIDInt(&cpuData->data.x86, item);

+    return virCPUx86DataAddItem(&cpuData->data.x86, item);

 }

-- 

2.22.0