External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-07 18:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu: Rename cpuDataParse

Browse Source 
The new name is virCPUDataParse.

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

4
src/cpu/cpu.c
View File

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

8
src/cpu/cpu.h
View File

@ -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__ */

4
src/cpu/cpu_x86.c
View File

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

2
src/libvirt_private.syms
View File

@ -977,7 +977,6 @@ cpuBaseline;
cpuBaselineXML;
cpuDataFormat;
cpuDataFree;
cpuDataParse;
cpuDecode;
cpuEncode;
cpuGuestData;
@ -986,6 +985,7 @@ virCPUCheckFeature;
virCPUCompare;
virCPUCompareXML;
virCPUDataCheckFeature;
virCPUDataParse;
virCPUGetModels;
virCPUTranslate;
virCPUUpdate;

2
tests/cputest.c
View File

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