[libvirt] [PATCH 04/14] cpu: Rename cpuDataFormat
The new name is virCPUDataFormat.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/cpu/cpu.c | 6 +++---
src/cpu/cpu.h | 8 ++++----
src/cpu/cpu_x86.c | 4 ++--
src/libvirt_private.syms | 2 +-
tests/qemumonitorjsontest.c | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index a357237..5040669 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -734,7 +734,7 @@ virCPUDataCheckFeature(const virCPUData *data,
/**
- * cpuDataFormat:
+ * virCPUDataFormat:
*
* @data: internal CPU representation
*
@@ -743,7 +743,7 @@ virCPUDataCheckFeature(const virCPUData *data,
* Returns string representation of the XML describing @data or NULL on error.
*/
char *
-cpuDataFormat(const virCPUData *data)
+virCPUDataFormat(const virCPUData *data)
{
struct cpuArchDriver *driver;
@@ -766,7 +766,7 @@ cpuDataFormat(const virCPUData *data)
/**
* virCPUDataParse:
*
- * @xmlStr: XML string produced by cpuDataFormat
+ * @xmlStr: XML string produced by virCPUDataFormat
*
* Parses XML representation of virCPUData structure for test purposes.
*
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index c2d6b12..917d847 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -99,7 +99,7 @@ typedef int
const char *feature);
typedef char *
-(*cpuArchDataFormat)(const virCPUData *data);
+(*virCPUArchDataFormat)(const virCPUData *data);
typedef virCPUDataPtr
(*virCPUArchDataParse)(xmlXPathContextPtr ctxt);
@@ -126,7 +126,7 @@ struct cpuArchDriver {
virCPUArchUpdate update;
virCPUArchCheckFeature checkFeature;
virCPUArchDataCheckFeature dataCheckFeature;
- cpuArchDataFormat dataFormat;
+ virCPUArchDataFormat dataFormat;
virCPUArchDataParse dataParse;
virCPUArchGetModels getModels;
virCPUArchTranslate translate;
@@ -230,10 +230,10 @@ virCPUTranslate(virArch arch,
ATTRIBUTE_NONNULL(2);
-/* cpuDataFormat and virCPUDataParse are implemented for unit tests only and
+/* virCPUDataFormat and virCPUDataParse are implemented for unit tests only and
* have no real-life usage
*/
-char *cpuDataFormat(const virCPUData *data)
+char *virCPUDataFormat(const virCPUData *data)
ATTRIBUTE_NONNULL(1);
virCPUDataPtr virCPUDataParse(const char *xmlStr)
ATTRIBUTE_NONNULL(1);
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index c3a3940..4f2a111 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -1412,7 +1412,7 @@ virCPUx86GetMap(void)
static char *
-x86CPUDataFormat(const virCPUData *data)
+virCPUx86DataFormat(const virCPUData *data)
{
virCPUx86DataIterator iter = virCPUx86DataIteratorInit(&data->data.x86);
virCPUx86CPUID *cpuid;
@@ -2765,7 +2765,7 @@ struct cpuArchDriver cpuDriverX86 = {
.update = virCPUx86Update,
.checkFeature = virCPUx86CheckFeature,
.dataCheckFeature = virCPUx86DataCheckFeature,
- .dataFormat = x86CPUDataFormat,
+ .dataFormat = virCPUx86DataFormat,
.dataParse = virCPUx86DataParse,
.getModels = virCPUx86GetModels,
.translate = virCPUx86Translate,
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d09f340..41b674d 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -975,7 +975,6 @@ virSecretObjSetValueSize;
# cpu/cpu.h
cpuBaseline;
cpuBaselineXML;
-cpuDataFormat;
cpuDataFree;
cpuDecode;
cpuEncode;
@@ -985,6 +984,7 @@ virCPUCheckFeature;
virCPUCompare;
virCPUCompareXML;
virCPUDataCheckFeature;
+virCPUDataFormat;
virCPUDataParse;
virCPUGetModels;
virCPUTranslate;
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index d8fd958..9f889a9 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -2329,7 +2329,7 @@ testQemuMonitorJSONGetCPUData(const void *opaque)
&cpuData) < 0)
goto cleanup;
- if (!(actual = cpuDataFormat(cpuData)))
+ if (!(actual = virCPUDataFormat(cpuData)))
goto cleanup;
if (virTestCompareToFile(actual, dataFile) < 0)
--
2.10.2