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@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>

diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index e1b0a5653f52df1c09ffe170ccc063a2e5dbab36..a1514c2e14863fa87c5969421195d22d3e32f620 100644 (file)
--- 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 14b201985e397914d1a38e485f7c131dd355e81f..501722d9acba80f6c55caeec65255d8f1609799d 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -21391,7 +21391,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 21a8be2cacc7fd54a356b059cb912a9c29d14e05..2685a3e8283c6eb173e48a4ca7a6fb7fe91de99c 100644 (file)
--- 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 cdf87a87e84fcaeccd9e4a0411f83577dcafe0b9..206dffe304f19f0df8a20d8ec06659b1355b5c0e 100644 (file)
--- 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);