提交 955be927 编写于 作者: J Jiri Denemark 提交者: Peter Krempa

cpu: x86: Rename x86DataAddCpuid as virCPUx86DataAddCPUID

上级 4a530268
...@@ -296,8 +296,8 @@ x86DataExpand(virCPUx86Data *data, ...@@ -296,8 +296,8 @@ x86DataExpand(virCPUx86Data *data,
static int static int
x86DataAddCpuid(virCPUx86Data *data, virCPUx86DataAddCPUID(virCPUx86Data *data,
const virCPUx86CPUID *cpuid) const virCPUx86CPUID *cpuid)
{ {
unsigned int basic_by = 0; unsigned int basic_by = 0;
unsigned int extended_by = 0; unsigned int extended_by = 0;
...@@ -734,7 +734,7 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, ...@@ -734,7 +734,7 @@ x86FeatureLoad(xmlXPathContextPtr ctxt,
i, feature->name); i, feature->name);
goto ignore; goto ignore;
} }
if (x86DataAddCpuid(feature->data, &cpuid)) if (virCPUx86DataAddCPUID(feature->data, &cpuid))
goto error; goto error;
} }
...@@ -1200,7 +1200,7 @@ x86CPUDataParse(const char *xmlStr) ...@@ -1200,7 +1200,7 @@ x86CPUDataParse(const char *xmlStr)
_("failed to parse cpuid[%zu]"), i); _("failed to parse cpuid[%zu]"), i);
goto cleanup; goto cleanup;
} }
if (x86DataAddCpuid(data, &cpuid) < 0) if (virCPUx86DataAddCPUID(data, &cpuid) < 0)
goto cleanup; goto cleanup;
} }
...@@ -1653,7 +1653,7 @@ x86Encode(virArch arch, ...@@ -1653,7 +1653,7 @@ x86Encode(virArch arch,
if (v && if (v &&
(VIR_ALLOC(data_vendor) < 0 || (VIR_ALLOC(data_vendor) < 0 ||
x86DataAddCpuid(data_vendor, &v->cpuid) < 0)) { virCPUx86DataAddCPUID(data_vendor, &v->cpuid) < 0)) {
goto error; goto error;
} }
} }
...@@ -1879,7 +1879,7 @@ x86Baseline(virCPUDefPtr *cpus, ...@@ -1879,7 +1879,7 @@ x86Baseline(virCPUDefPtr *cpus,
goto error; goto error;
} }
if (vendor && x86DataAddCpuid(base_model->data, &vendor->cpuid) < 0) if (vendor && virCPUx86DataAddCPUID(base_model->data, &vendor->cpuid) < 0)
goto error; goto error;
if (x86Decode(cpu, base_model->data, models, nmodels, NULL, flags) < 0) if (x86Decode(cpu, base_model->data, models, nmodels, NULL, flags) < 0)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册