From c3573dbf60524401d06da6f6c5ce70a780494509 Mon Sep 17 00:00:00 2001
Message-Id: <c3573dbf60524401d06da6f6c5ce70a780494509@dist-git>
From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 21 Jun 2019 09:25:30 +0200
Subject: [PATCH] cpu_x86: Rename virCPUx86VendorToCPUID
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Renamed as virCPUx86VendorToData.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
(cherry picked from commit 3eff71a2d5048b30ded73bc6e542cbbd3e5b6193)

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

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Message-Id: <01af4e7922b394abeb1ea11856c188cb80ffb9a8.1561068591.git.jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/cpu/cpu_x86.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 6d48c9264c..9c0f39e76d 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -526,8 +526,8 @@ x86DataToVendor(const virCPUx86Data *data,
 
 
 static int
-virCPUx86VendorToCPUID(const char *vendor,
-                       virCPUx86DataItemPtr data)
+virCPUx86VendorToData(const char *vendor,
+                      virCPUx86DataItemPtr data)
 {
     virCPUx86CPUIDPtr cpuid = &data->cpuid;
 
@@ -759,7 +759,7 @@ x86VendorParse(xmlXPathContextPtr ctxt,
         goto cleanup;
     }
 
-    if (virCPUx86VendorToCPUID(string, &vendor->data) < 0)
+    if (virCPUx86VendorToData(string, &vendor->data) < 0)
         goto cleanup;
 
     if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0)
@@ -3114,7 +3114,7 @@ virCPUx86DataSetVendor(virCPUDataPtr cpuData,
 {
     virCPUx86DataItem item = CPUID(0);
 
-    if (virCPUx86VendorToCPUID(vendor, &item) < 0)
+    if (virCPUx86VendorToData(vendor, &item) < 0)
         return -1;
 
     return virCPUx86DataAdd(cpuData, &item);
-- 
2.22.0