[libvirt] [PATCH 03/14] cpu: Rename cpuDataParse
The new name is virCPUDataParse.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/cpu/cpu.c | 4 ++--
src/cpu/cpu.h | 8 ++++----
src/cpu/cpu_x86.c | 4 ++--
src/libvirt_private.syms | 2 +-
tests/cputest.c | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index e8bcce8..a357237 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -764,7 +764,7 @@ cpuDataFormat(const virCPUData *data)
/**
- * cpuDataParse:
+ * virCPUDataParse:
*
* @xmlStr: XML string produced by cpuDataFormat
*
@@ -773,7 +773,7 @@ cpuDataFormat(const virCPUData *data)
* Returns internal CPU data structure parsed from the XML or NULL on error.
*/
virCPUDataPtr
-cpuDataParse(const char *xmlStr)
+virCPUDataParse(const char *xmlStr)
{
struct cpuArchDriver *driver;
xmlDocPtr xml = NULL;
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index 86cb96b..c2d6b12 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -102,7 +102,7 @@ typedef char *
(*cpuArchDataFormat)(const virCPUData *data);
typedef virCPUDataPtr
-(*cpuArchDataParse) (xmlXPathContextPtr ctxt);
+(*virCPUArchDataParse)(xmlXPathContextPtr ctxt);
typedef int
(*virCPUArchGetModels)(char ***models);
@@ -127,7 +127,7 @@ struct cpuArchDriver {
virCPUArchCheckFeature checkFeature;
virCPUArchDataCheckFeature dataCheckFeature;
cpuArchDataFormat dataFormat;
- cpuArchDataParse dataParse;
+ virCPUArchDataParse dataParse;
virCPUArchGetModels getModels;
virCPUArchTranslate translate;
};
@@ -230,12 +230,12 @@ virCPUTranslate(virArch arch,
ATTRIBUTE_NONNULL(2);
-/* cpuDataFormat and cpuDataParse are implemented for unit tests only and
+/* cpuDataFormat and virCPUDataParse are implemented for unit tests only and
* have no real-life usage
*/
char *cpuDataFormat(const virCPUData *data)
ATTRIBUTE_NONNULL(1);
-virCPUDataPtr cpuDataParse(const char *xmlStr)
+virCPUDataPtr virCPUDataParse(const char *xmlStr)
ATTRIBUTE_NONNULL(1);
#endif /* __VIR_CPU_H__ */
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 5dfe549..c3a3940 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -1437,7 +1437,7 @@ x86CPUDataFormat(const virCPUData *data)
static virCPUDataPtr
-x86CPUDataParse(xmlXPathContextPtr ctxt)
+virCPUx86DataParse(xmlXPathContextPtr ctxt)
{
xmlNodePtr *nodes = NULL;
virCPUDataPtr cpuData = NULL;
@@ -2766,7 +2766,7 @@ struct cpuArchDriver cpuDriverX86 = {
.checkFeature = virCPUx86CheckFeature,
.dataCheckFeature = virCPUx86DataCheckFeature,
.dataFormat = x86CPUDataFormat,
- .dataParse = x86CPUDataParse,
+ .dataParse = virCPUx86DataParse,
.getModels = virCPUx86GetModels,
.translate = virCPUx86Translate,
};
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 8b16dc1..d09f340 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -977,7 +977,6 @@ cpuBaseline;
cpuBaselineXML;
cpuDataFormat;
cpuDataFree;
-cpuDataParse;
cpuDecode;
cpuEncode;
cpuGuestData;
@@ -986,6 +985,7 @@ virCPUCheckFeature;
virCPUCompare;
virCPUCompareXML;
virCPUDataCheckFeature;
+virCPUDataParse;
virCPUGetModels;
virCPUTranslate;
virCPUUpdate;
diff --git a/tests/cputest.c b/tests/cputest.c
index 6842d27..0d7f3ec 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -472,7 +472,7 @@ cpuTestCPUID(bool guest, const void *arg)
goto cleanup;
if (virTestLoadFile(hostFile, &host) < 0 ||
- !(hostData = cpuDataParse(host)))
+ !(hostData = virCPUDataParse(host)))
goto cleanup;
if (VIR_ALLOC(cpu) < 0)
--
2.10.2