[libvirt] [PATCH 05/17] nodeinfo: rename all CPU APIs to have a virHostCPU prefix

John Ferlan jferlan at redhat.com
Tue Apr 26 18:48:13 UTC 2016



On 04/14/2016 11:22 AM, Daniel P. Berrange wrote:
> In preparation for moving all the CPU related APIs out of
> the nodeinfo file, give them a virHostCPU name prefix.
> 
> Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
> ---
>  src/libvirt_linux.syms     |   6 +-
>  src/libvirt_private.syms   |  12 +--
>  src/lxc/lxc_controller.c   |   2 +-
>  src/lxc/lxc_driver.c       |   4 +-
>  src/nodeinfo.c             | 212 ++++++++++++++++++++++-----------------------
>  src/nodeinfo.h             |  22 ++---
>  src/nodeinfopriv.h         |  26 +++---
>  src/openvz/openvz_driver.c |   4 +-
>  src/qemu/qemu_driver.c     |  10 +--
>  src/qemu/qemu_process.c    |   2 +-
>  src/uml/uml_driver.c       |   4 +-
>  src/util/vircgroup.c       |   2 +-
>  tests/nodeinfomock.c       |   2 +-
>  tests/nodeinfotest.c       |  20 ++---
>  tests/vircgrouptest.c      |   4 +-
>  15 files changed, 166 insertions(+), 166 deletions(-)
> 
> diff --git a/src/libvirt_linux.syms b/src/libvirt_linux.syms
> index f569a23..a2fc076 100644
> --- a/src/libvirt_linux.syms
> +++ b/src/libvirt_linux.syms
> @@ -3,9 +3,9 @@
>  #
>  
>  # nodeinfo.h
> -linuxNodeGetCPUStats;
> -linuxNodeInfoCPUPopulate;
> -linuxNodeInfoSetSysFSSystemPath;
> +virHostCPUGetInfoPopulateLinux;
> +virHostCPUGetStatsLinux;
> +virHostCPUSetSysFSSystemPathLinux;
>  
>  # Let emacs know we want case-insensitive sorting
>  # Local Variables:
> diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
> index 2317c25..22b81ae 100644
> --- a/src/libvirt_private.syms
> +++ b/src/libvirt_private.syms
> @@ -1026,13 +1026,13 @@ virLogManagerNew;
>  
>  # nodeinfo.h
>  nodeCapsInitNUMA;
> -nodeGetCPUCount;

cscope shows reference in 'src/vz/vz_sdk.c'

> -nodeGetCPUMap;

cscope shows reference in bhyve_driver.c and vz_driver.c

> -nodeGetCPUStats;

cscope shows reference in bhyve_driver.c and vz_driver.c

>  nodeGetInfo;
> -nodeGetOnlineCPUBitmap;
> -nodeGetPresentCPUBitmap;
> -nodeGetThreadsPerSubcore;
> +virHostCPUGetCount;
> +virHostCPUGetMap;
> +virHostCPUGetOnlineBitmap;
> +virHostCPUGetPresentBitmap;
> +virHostCPUGetStats;
> +virHostCPUGetThreadsPerSubcore;
>  virHostMemAllocPages;
>  virHostMemGetCellsFree;
>  virHostMemGetFreePages;


[...]

> diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
> index 6ce03f7..148721d 100644
> --- a/tests/vircgrouptest.c
> +++ b/tests/vircgrouptest.c
> @@ -649,8 +649,8 @@ static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED)
>          goto cleanup;
>      }
>  
> -    if (nodeGetCPUCount() != EXPECTED_NCPUS) {
> -        fprintf(stderr, "Unexpected: nodeGetCPUCount() yields: %d\n", nodeGetCPUCount());
> +    if (virHostCPUGetCount() != EXPECTED_NCPUS) {
> +        fprintf(stderr, "Unexpected: nodeGetCPUCount() yields: %d\n", virHostCPUGetCount());

                                        ^^^^^

May as well adjust the error message too...

ACK w/ adjustments.

John
>          goto cleanup;
>      }
>  
> 




More information about the libvir-list mailing list