From: Wim ten Have <wim.ten.have@oracle.com>

This patch renames virDomainNumaDefCPUFormat(), by adding XML, into
virDomainNumaDefCPUFormatXML().  So that it meets its peer Parse
sibling virDomainNumaDefCPUParseXML() and matches vir*XML() function
naming conventions.

Signed-off-by: Wim ten Have <wim.ten.have@oracle.com>
---
Changes on v3:
- Cleanup by putting this change under a separate patch in series.
---
 src/conf/cpu_conf.c  | 2 +-
 src/conf/numa_conf.c | 4 ++--
 src/conf/numa_conf.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index c21d11d..8d804a1 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -642,7 +642,7 @@ virCPUDefFormatBufFull(virBufferPtr buf,
     if (virCPUDefFormatBuf(&childrenBuf, def, updateCPU) < 0)
         goto cleanup;
 
-    if (virDomainNumaDefCPUFormat(&childrenBuf, numa) < 0)
+    if (virDomainNumaDefCPUFormatXML(&childrenBuf, numa) < 0)
         goto cleanup;
 
     if (virBufferCheckError(&attributeBuf) < 0 ||
diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c
index bfd3703..b71dc01 100644
--- a/src/conf/numa_conf.c
+++ b/src/conf/numa_conf.c
@@ -801,8 +801,8 @@ virDomainNumaDefCPUParseXML(virDomainNumaPtr def,
 
 
 int
-virDomainNumaDefCPUFormat(virBufferPtr buf,
-                          virDomainNumaPtr def)
+virDomainNumaDefCPUFormatXML(virBufferPtr buf,
+                             virDomainNumaPtr def)
 {
     virDomainMemoryAccess memAccess;
     char *cpustr;
diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h
index b6a5354..378b772 100644
--- a/src/conf/numa_conf.h
+++ b/src/conf/numa_conf.h
@@ -151,7 +151,7 @@ bool virDomainNumatuneNodeSpecified(virDomainNumaPtr numatune,
                                     int cellid);
 
 int virDomainNumaDefCPUParseXML(virDomainNumaPtr def, xmlXPathContextPtr ctxt);
-int virDomainNumaDefCPUFormat(virBufferPtr buf, virDomainNumaPtr def);
+int virDomainNumaDefCPUFormatXML(virBufferPtr buf, virDomainNumaPtr def);
 
 unsigned int virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa);
 
-- 
2.9.5

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On 09/08/2017 08:47 AM, Wim Ten Have wrote:
> From: Wim ten Have <wim.ten.have@oracle.com>
> 
> This patch renames virDomainNumaDefCPUFormat(), by adding XML, into
> virDomainNumaDefCPUFormatXML().  So that it meets its peer Parse
> sibling virDomainNumaDefCPUParseXML() and matches vir*XML() function
> naming conventions.
> 
> Signed-off-by: Wim ten Have <wim.ten.have@oracle.com>
> ---
> Changes on v3:
> - Cleanup by putting this change under a separate patch in series.
> ---
>   src/conf/cpu_conf.c  | 2 +-
>   src/conf/numa_conf.c | 4 ++--
>   src/conf/numa_conf.h | 2 +-
>   3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
> index c21d11d..8d804a1 100644
> --- a/src/conf/cpu_conf.c
> +++ b/src/conf/cpu_conf.c
> @@ -642,7 +642,7 @@ virCPUDefFormatBufFull(virBufferPtr buf,
>       if (virCPUDefFormatBuf(&childrenBuf, def, updateCPU) < 0)
>           goto cleanup;
>   
> -    if (virDomainNumaDefCPUFormat(&childrenBuf, numa) < 0)
> +    if (virDomainNumaDefCPUFormatXML(&childrenBuf, numa) < 0)
>           goto cleanup;
>   
>       if (virBufferCheckError(&attributeBuf) < 0 ||
> diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c
> index bfd3703..b71dc01 100644
> --- a/src/conf/numa_conf.c
> +++ b/src/conf/numa_conf.c
> @@ -801,8 +801,8 @@ virDomainNumaDefCPUParseXML(virDomainNumaPtr def,
>   
>   
>   int
> -virDomainNumaDefCPUFormat(virBufferPtr buf,
> -                          virDomainNumaPtr def)
> +virDomainNumaDefCPUFormatXML(virBufferPtr buf,
> +                             virDomainNumaPtr def)
>   {
>       virDomainMemoryAccess memAccess;
>       char *cpustr;
> diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h
> index b6a5354..378b772 100644
> --- a/src/conf/numa_conf.h
> +++ b/src/conf/numa_conf.h
> @@ -151,7 +151,7 @@ bool virDomainNumatuneNodeSpecified(virDomainNumaPtr numatune,
>                                       int cellid);
>   
>   int virDomainNumaDefCPUParseXML(virDomainNumaPtr def, xmlXPathContextPtr ctxt);
> -int virDomainNumaDefCPUFormat(virBufferPtr buf, virDomainNumaPtr def);
> +int virDomainNumaDefCPUFormatXML(virBufferPtr buf, virDomainNumaPtr def);
>   
>   unsigned int virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa);

Name symmetry between the other vir*{Format,Parse}XML functions seems sane to me.

Reviewed-by: Jim Fehlig <jfehlig@suse.com>

This one can be pushed independent of the series, and I'll do so shortly after 
rewording the commit message a bit.

Regards,
Jim

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list