100 lines
3.6 KiB
Diff
100 lines
3.6 KiB
Diff
|
From 088d9da6e6c4f3edc0293f78ba7270941d2e7fd0 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <088d9da6e6c4f3edc0293f78ba7270941d2e7fd0@dist-git>
|
||
|
|
From: Jiri Denemark <jdenemar@redhat.com>
|
||
|
|
Date: Fri, 21 Jun 2019 09:25:23 +0200
|
||
|
|
Subject: [PATCH] cpu_x86: Rename virCPUx86Vendor.cpuid
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Although vendor string is always reported by CPUID, the container struct
|
||
|
|
is used for consistency and thus "cpuid" name is not a good fit anymore.
|
||
|
|
|
||
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
(cherry picked from commit c02d70d52efc4b7af09e68847ef72ad47a6bdcf1)
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1697627
|
||
|
|
|
||
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
||
|
|
Message-Id: <0b6fccb50f2ce2b5d926a75c90a8107a300c8d57.1561068591.git.jdenemar@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
---
|
||
|
|
src/cpu/cpu_x86.c | 18 +++++++++---------
|
||
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
|
||
|
|
index 2e953eaa12..6e1fb37d20 100644
|
||
|
|
--- a/src/cpu/cpu_x86.c
|
||
|
|
+++ b/src/cpu/cpu_x86.c
|
||
|
|
@@ -49,7 +49,7 @@ typedef struct _virCPUx86Vendor virCPUx86Vendor;
|
||
|
|
typedef virCPUx86Vendor *virCPUx86VendorPtr;
|
||
|
|
struct _virCPUx86Vendor {
|
||
|
|
char *name;
|
||
|
|
- virCPUx86DataItem cpuid;
|
||
|
|
+ virCPUx86DataItem data;
|
||
|
|
};
|
||
|
|
|
||
|
|
typedef struct _virCPUx86Feature virCPUx86Feature;
|
||
|
|
@@ -514,9 +514,9 @@ x86DataToVendor(const virCPUx86Data *data,
|
||
|
|
|
||
|
|
for (i = 0; i < map->nvendors; i++) {
|
||
|
|
virCPUx86VendorPtr vendor = map->vendors[i];
|
||
|
|
- if ((cpuid = x86DataCpuid(data, &vendor->cpuid)) &&
|
||
|
|
- x86cpuidMatchMasked(&cpuid->cpuid, &vendor->cpuid.cpuid)) {
|
||
|
|
- x86cpuidClearBits(&cpuid->cpuid, &vendor->cpuid.cpuid);
|
||
|
|
+ if ((cpuid = x86DataCpuid(data, &vendor->data)) &&
|
||
|
|
+ x86cpuidMatchMasked(&cpuid->cpuid, &vendor->data.cpuid)) {
|
||
|
|
+ x86cpuidClearBits(&cpuid->cpuid, &vendor->data.cpuid);
|
||
|
|
return vendor;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
@@ -759,7 +759,7 @@ x86VendorParse(xmlXPathContextPtr ctxt,
|
||
|
|
goto cleanup;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (virCPUx86VendorToCPUID(string, &vendor->cpuid) < 0)
|
||
|
|
+ if (virCPUx86VendorToCPUID(string, &vendor->data) < 0)
|
||
|
|
goto cleanup;
|
||
|
|
|
||
|
|
if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0)
|
||
|
|
@@ -1665,7 +1665,7 @@ x86Compute(virCPUDefPtr host,
|
||
|
|
|
||
|
|
if (cpu->vendor && host_model->vendor &&
|
||
|
|
virCPUx86DataAddCPUIDInt(&guest_model->data,
|
||
|
|
- &host_model->vendor->cpuid) < 0)
|
||
|
|
+ &host_model->vendor->data) < 0)
|
||
|
|
goto error;
|
||
|
|
|
||
|
|
if (host_model->signatures &&
|
||
|
|
@@ -2153,7 +2153,7 @@ x86Encode(virArch arch,
|
||
|
|
if (!(data_vendor = virCPUDataNew(arch)))
|
||
|
|
goto error;
|
||
|
|
|
||
|
|
- if (v && virCPUx86DataAddCPUID(data_vendor, &v->cpuid) < 0)
|
||
|
|
+ if (v && virCPUx86DataAddCPUID(data_vendor, &v->data) < 0)
|
||
|
|
goto error;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -2650,7 +2650,7 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
|
||
|
|
}
|
||
|
|
|
||
|
|
if (vendor &&
|
||
|
|
- virCPUx86DataAddCPUIDInt(&base_model->data, &vendor->cpuid) < 0)
|
||
|
|
+ virCPUx86DataAddCPUIDInt(&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->cpuid) < 0)
|
||
|
|
+ virCPUx86DataAddCPUIDInt(&model->data, &model->vendor->data) < 0)
|
||
|
|
goto cleanup;
|
||
|
|
|
||
|
|
if (model->signatures &&
|
||
|
|
--
|
||
|
|
2.22.0
|
||
|
|
|