From 17af84e23715e70e28068d57ad3313601278156f Mon Sep 17 00:00:00 2001 Message-Id: <17af84e23715e70e28068d57ad3313601278156f.1383922566.git.jdenemar@redhat.com> From: Jiri Denemark Date: Fri, 8 Nov 2013 12:33:23 +0100 Subject: [PATCH] cpu: x86: Rename x86DataAddCpuid as virCPUx86DataAddCPUID https://bugzilla.redhat.com/show_bug.cgi?id=1008989 (cherry picked from commit 955be92773297a6a2f9f0d223481120ff17f29fb) Signed-off-by: Jiri Denemark --- src/cpu/cpu_x86.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index a857559..672d6e0 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -296,8 +296,8 @@ x86DataExpand(virCPUx86Data *data, static int -x86DataAddCpuid(virCPUx86Data *data, - const virCPUx86CPUID *cpuid) +virCPUx86DataAddCPUID(virCPUx86Data *data, + const virCPUx86CPUID *cpuid) { unsigned int basic_by = 0; unsigned int extended_by = 0; @@ -734,7 +734,7 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, i, feature->name); goto ignore; } - if (x86DataAddCpuid(feature->data, &cpuid)) + if (virCPUx86DataAddCPUID(feature->data, &cpuid)) goto error; } @@ -1200,7 +1200,7 @@ x86CPUDataParse(const char *xmlStr) _("failed to parse cpuid[%zu]"), i); goto cleanup; } - if (x86DataAddCpuid(data, &cpuid) < 0) + if (virCPUx86DataAddCPUID(data, &cpuid) < 0) goto cleanup; } @@ -1618,7 +1618,7 @@ x86Encode(virArch arch, if (v && (VIR_ALLOC(data_vendor) < 0 || - x86DataAddCpuid(data_vendor, &v->cpuid) < 0)) { + virCPUx86DataAddCPUID(data_vendor, &v->cpuid) < 0)) { goto error; } } @@ -1843,7 +1843,7 @@ x86Baseline(virCPUDefPtr *cpus, goto error; } - if (vendor && x86DataAddCpuid(base_model->data, &vendor->cpuid) < 0) + if (vendor && virCPUx86DataAddCPUID(base_model->data, &vendor->cpuid) < 0) goto error; if (x86Decode(cpu, base_model->data, models, nmodels, NULL) < 0) -- 1.8.4.2