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