[PATCH 03/13] numa_conf: Drop CPU from name of two functions
There are two functions virDomainNumaDefCPUFormatXML() and
virDomainNumaDefCPUParseXML() which format and parse domain's
<numa/>. There is nothing CPU specific about them. Drop the
infix.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/conf/cpu_conf.c | 2 +-
src/conf/domain_conf.c | 2 +-
src/conf/numa_conf.c | 8 ++++----
src/conf/numa_conf.h | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index e1b0a5653f..a1514c2e14 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -734,7 +734,7 @@ virCPUDefFormatBufFull(virBufferPtr buf,
if (virCPUDefFormatBuf(&childrenBuf, def) < 0)
goto cleanup;
- if (virDomainNumaDefCPUFormatXML(&childrenBuf, numa) < 0)
+ if (virDomainNumaDefFormatXML(&childrenBuf, numa) < 0)
goto cleanup;
/* Put it all together */
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 65a110b16f..ce75831037 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -21394,7 +21394,7 @@ virDomainDefParseXML(xmlDocPtr xml,
if (virCPUDefParseXML(ctxt, "./cpu[1]", VIR_CPU_TYPE_GUEST,
&def->cpu) < 0)
goto error;
- if (virDomainNumaDefCPUParseXML(def->numa, ctxt) < 0)
+ if (virDomainNumaDefParseXML(def->numa, ctxt) < 0)
goto error;
if (virDomainNumaGetCPUCountTotal(def->numa) > virDomainDefGetVcpusMax(def)) {
diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c
index 21a8be2cac..2685a3e828 100644
--- a/src/conf/numa_conf.c
+++ b/src/conf/numa_conf.c
@@ -842,8 +842,8 @@ virDomainNumaDefNodeDistanceParseXML(virDomainNumaPtr def,
}
int
-virDomainNumaDefCPUParseXML(virDomainNumaPtr def,
- xmlXPathContextPtr ctxt)
+virDomainNumaDefParseXML(virDomainNumaPtr def,
+ xmlXPathContextPtr ctxt)
{
xmlNodePtr *nodes = NULL;
VIR_XPATH_NODE_AUTORESTORE(ctxt);
@@ -970,8 +970,8 @@ virDomainNumaDefCPUParseXML(virDomainNumaPtr def,
int
-virDomainNumaDefCPUFormatXML(virBufferPtr buf,
- virDomainNumaPtr def)
+virDomainNumaDefFormatXML(virBufferPtr buf,
+ virDomainNumaPtr def)
{
virDomainMemoryAccess memAccess;
virTristateBool discard;
diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h
index cdf87a87e8..206dffe304 100644
--- a/src/conf/numa_conf.h
+++ b/src/conf/numa_conf.h
@@ -181,8 +181,8 @@ bool virDomainNumatuneNodesetIsAvailable(virDomainNumaPtr numatune,
bool virDomainNumatuneNodeSpecified(virDomainNumaPtr numatune,
int cellid);
-int virDomainNumaDefCPUParseXML(virDomainNumaPtr def, xmlXPathContextPtr ctxt);
-int virDomainNumaDefCPUFormatXML(virBufferPtr buf, virDomainNumaPtr def);
+int virDomainNumaDefParseXML(virDomainNumaPtr def, xmlXPathContextPtr ctxt);
+int virDomainNumaDefFormatXML(virBufferPtr buf, virDomainNumaPtr def);
unsigned int virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa);
--
2.26.2