From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 14 Mar 2019 21:30:52 +0000 (+0100)
Subject: cpu_x86: Rename virCPUx86VendorToCPUID
X-Git-Tag: v5.3.0-rc1~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eff71a2d5048b30ded73bc6e542cbbd3e5b6193;p=thirdparty%2Flibvirt.git

cpu_x86: Rename virCPUx86VendorToCPUID

Renamed as virCPUx86VendorToData.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 492839496e..121c88ad43 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -527,8 +527,8 @@ x86DataToVendor(const virCPUx86Data *data,
 
 
 static int
-virCPUx86VendorToCPUID(const char *vendor,
-                       virCPUx86DataItemPtr data)
+virCPUx86VendorToData(const char *vendor,
+                      virCPUx86DataItemPtr data)
 {
     virCPUx86CPUIDPtr cpuid = &data->cpuid;
 
@@ -760,7 +760,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)
@@ -3115,7 +3115,7 @@ virCPUx86DataSetVendor(virCPUDataPtr cpuData,
 {
     virCPUx86DataItem item = CPUID(0);
 
-    if (virCPUx86VendorToCPUID(vendor, &item) < 0)
+    if (virCPUx86VendorToData(vendor, &item) < 0)
         return -1;
 
     return virCPUx86DataAdd(cpuData, &item);