|
 |
c480ed |
From c3573dbf60524401d06da6f6c5ce70a780494509 Mon Sep 17 00:00:00 2001
|
|
|
c480ed |
Message-Id: <c3573dbf60524401d06da6f6c5ce70a780494509@dist-git>
|
|
|
c480ed |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c480ed |
Date: Fri, 21 Jun 2019 09:25:30 +0200
|
|
|
c480ed |
Subject: [PATCH] cpu_x86: Rename virCPUx86VendorToCPUID
|
|
|
c480ed |
MIME-Version: 1.0
|
|
|
c480ed |
Content-Type: text/plain; charset=UTF-8
|
|
|
c480ed |
Content-Transfer-Encoding: 8bit
|
|
|
c480ed |
|
|
|
c480ed |
Renamed as virCPUx86VendorToData.
|
|
|
c480ed |
|
|
|
c480ed |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c480ed |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
c480ed |
(cherry picked from commit 3eff71a2d5048b30ded73bc6e542cbbd3e5b6193)
|
|
|
c480ed |
|
|
|
c480ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1697627
|
|
|
c480ed |
|
|
|
c480ed |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c480ed |
Message-Id: <01af4e7922b394abeb1ea11856c188cb80ffb9a8.1561068591.git.jdenemar@redhat.com>
|
|
|
c480ed |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
c480ed |
---
|
|
|
c480ed |
src/cpu/cpu_x86.c | 8 ++++----
|
|
|
c480ed |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
c480ed |
|
|
|
c480ed |
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
|
|
|
c480ed |
index 6d48c9264c..9c0f39e76d 100644
|
|
|
c480ed |
--- a/src/cpu/cpu_x86.c
|
|
|
c480ed |
+++ b/src/cpu/cpu_x86.c
|
|
|
c480ed |
@@ -526,8 +526,8 @@ x86DataToVendor(const virCPUx86Data *data,
|
|
|
c480ed |
|
|
|
c480ed |
|
|
|
c480ed |
static int
|
|
|
c480ed |
-virCPUx86VendorToCPUID(const char *vendor,
|
|
|
c480ed |
- virCPUx86DataItemPtr data)
|
|
|
c480ed |
+virCPUx86VendorToData(const char *vendor,
|
|
|
c480ed |
+ virCPUx86DataItemPtr data)
|
|
|
c480ed |
{
|
|
|
c480ed |
virCPUx86CPUIDPtr cpuid = &data->cpuid;
|
|
|
c480ed |
|
|
|
c480ed |
@@ -759,7 +759,7 @@ x86VendorParse(xmlXPathContextPtr ctxt,
|
|
|
c480ed |
goto cleanup;
|
|
|
c480ed |
}
|
|
|
c480ed |
|
|
|
c480ed |
- if (virCPUx86VendorToCPUID(string, &vendor->data) < 0)
|
|
|
c480ed |
+ if (virCPUx86VendorToData(string, &vendor->data) < 0)
|
|
|
c480ed |
goto cleanup;
|
|
|
c480ed |
|
|
|
c480ed |
if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0)
|
|
|
c480ed |
@@ -3114,7 +3114,7 @@ virCPUx86DataSetVendor(virCPUDataPtr cpuData,
|
|
|
c480ed |
{
|
|
|
c480ed |
virCPUx86DataItem item = CPUID(0);
|
|
|
c480ed |
|
|
|
c480ed |
- if (virCPUx86VendorToCPUID(vendor, &item) < 0)
|
|
|
c480ed |
+ if (virCPUx86VendorToData(vendor, &item) < 0)
|
|
|
c480ed |
return -1;
|
|
|
c480ed |
|
|
|
c480ed |
return virCPUx86DataAdd(cpuData, &item);
|
|
|
c480ed |
--
|
|
|
c480ed |
2.22.0
|
|
|
c480ed |
|