openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cpu: Rename cpuDataFormat 

The new name is virCPUDataFormat.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2016-11-04 15:09:20 +01:00
parent be57e68954
commit 53a5986ad6
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cpu/cpu.c
View File

@ -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.
*

8
src/cpu/cpu.h
View File

@ -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);

4
src/cpu/cpu_x86.c
View File

@ -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,

2
src/libvirt_private.syms
View File

@ -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;

2
tests/qemumonitorjsontest.c
View File

@ -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)