virHostCPUGet(Map|Stats): Remove unused 'flags'

The utility functions which get CPU map and stats don't actually use the
flags. Remove the argument and move the 'virCheckFlags' to driver
implementation.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index c8dd1a728ac2e550049f19a2431275ee9b771f30..2718c074f3b370c613fecd95a8204f4c31cf7b1e 100644 (file)
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -1145,10 +1145,12 @@ bhyveNodeGetCPUStats(virConnectPtr conn,
                      int *nparams,
                      unsigned int flags)
 {
+    virCheckFlags(0, -1);
+
     if (virNodeGetCPUStatsEnsureACL(conn) < 0)
         return -1;
 
-    return virHostCPUGetStats(cpuNum, params, nparams, flags);
+    return virHostCPUGetStats(cpuNum, params, nparams);
 }
 
 static int
@@ -1359,10 +1361,12 @@ bhyveNodeGetCPUMap(virConnectPtr conn,
                    unsigned int *online,
                    unsigned int flags)
 {
+    virCheckFlags(0, -1);
+
     if (virNodeGetCPUMapEnsureACL(conn) < 0)
         return -1;
 
-    return virHostCPUGetMap(cpumap, online, flags);
+    return virHostCPUGetMap(cpumap, online);
 }
 
 static int

diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c
index 662857f88e2f1b13794fc33223a0e438ca632c2a..874fca219303e5af0ace40028dbf9e655712990d 100644 (file)
--- a/src/ch/ch_driver.c
+++ b/src/ch/ch_driver.c
@@ -1642,12 +1642,15 @@ chDomainGetVcpuPinInfo(virDomain *dom,
 static int
 chNodeGetCPUMap(virConnectPtr conn,
                 unsigned char **cpumap,
-                unsigned int *online, unsigned int flags)
+                unsigned int *online,
+                unsigned int flags)
 {
+    virCheckFlags(0, -1);
+
     if (virNodeGetCPUMapEnsureACL(conn) < 0)
         return -1;
 
-    return virHostCPUGetMap(cpumap, online, flags);
+    return virHostCPUGetMap(cpumap, online);
 }
 
 

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 69eafc110d2f0a8f67e88449fc6e392dc93e83bc..4ba54de2e4f24cbf847e61a1e89558e4c21d4fc8 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -4787,10 +4787,12 @@ lxcNodeGetCPUStats(virConnectPtr conn,
                    int *nparams,
                    unsigned int flags)
 {
+    virCheckFlags(0, -1);
+
     if (virNodeGetCPUStatsEnsureACL(conn) < 0)
         return -1;
 
-    return virHostCPUGetStats(cpuNum, params, nparams, flags);
+    return virHostCPUGetStats(cpuNum, params, nparams);
 }
 
 
@@ -4868,10 +4870,12 @@ lxcNodeGetCPUMap(virConnectPtr conn,
                  unsigned int *online,
                  unsigned int flags)
 {
+    virCheckFlags(0, -1);
+
     if (virNodeGetCPUMapEnsureACL(conn) < 0)
         return -1;
 
-    return virHostCPUGetMap(cpumap, online, flags);
+    return virHostCPUGetMap(cpumap, online);
 }
 
 

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 19bdfa37f23406a6f5e351985069e1eea6fdc64c..60b8a9534babf36e63fa449bd768479bc47bfc0c 100644 (file)
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -1849,7 +1849,9 @@ openvzNodeGetCPUStats(virConnectPtr conn G_GNUC_UNUSED,
                       int *nparams,
                       unsigned int flags)
 {
-    return virHostCPUGetStats(cpuNum, params, nparams, flags);
+    virCheckFlags(0, -1);
+
+    return virHostCPUGetStats(cpuNum, params, nparams);
 }
 
 
@@ -1890,7 +1892,9 @@ openvzNodeGetCPUMap(virConnectPtr conn G_GNUC_UNUSED,
                     unsigned int *online,
                     unsigned int flags)
 {
-    return virHostCPUGetMap(cpumap, online, flags);
+    virCheckFlags(0, -1);
+
+    return virHostCPUGetMap(cpumap, online);
 }
 
 

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 1070986430fa6c2005b6d2f11bc2f89534831819..d16e1ffa975e804d380d957cfb3ec26d4fdc4ebd 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -16390,10 +16390,12 @@ qemuNodeGetCPUStats(virConnectPtr conn,
                     int *nparams,
                     unsigned int flags)
 {
+    virCheckFlags(0, -1);
+
     if (virNodeGetCPUStatsEnsureACL(conn) < 0)
         return -1;
 
-    return virHostCPUGetStats(cpuNum, params, nparams, flags);
+    return virHostCPUGetStats(cpuNum, params, nparams);
 }
 
 
@@ -16471,10 +16473,12 @@ qemuNodeGetCPUMap(virConnectPtr conn,
                   unsigned int *online,
                   unsigned int flags)
 {
+    virCheckFlags(0, -1);
+
     if (virNodeGetCPUMapEnsureACL(conn) < 0)
         return -1;
 
-    return virHostCPUGetMap(cpumap, online, flags);
+    return virHostCPUGetMap(cpumap, online);
 }
 
 

diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index 870338edad0aed8afcea8f7b3fdcad62883f0914..60743765a4bf9414038e5bcf398c31ba31752bde 100644 (file)
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -1043,11 +1043,8 @@ virHostCPUGetInfo(virArch hostarch G_GNUC_UNUSED,
 int
 virHostCPUGetStats(int cpuNum G_GNUC_UNUSED,
                    virNodeCPUStatsPtr params G_GNUC_UNUSED,
-                   int *nparams G_GNUC_UNUSED,
-                   unsigned int flags)
+                   int *nparams G_GNUC_UNUSED)
 {
-    virCheckFlags(0, -1);
-
 #ifdef __linux__
     {
         int ret;
@@ -1144,14 +1141,11 @@ virHostCPUGetOnlineBitmap(void)
 
 int
 virHostCPUGetMap(unsigned char **cpumap,
-                 unsigned int *online,
-                 unsigned int flags)
+                 unsigned int *online)
 {
     g_autoptr(virBitmap) cpus = NULL;
     int ncpus = virHostCPUGetCount();
 
-    virCheckFlags(0, -1);
-
     if (!cpumap && !online)
         return ncpus;
 

diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h
index 289ae41439a2df5bffabf48f7db3c513d841a1c1..238054ed348c001cb26bcfb7932d1f33ef3da4e4 100644 (file)
--- a/src/util/virhostcpu.h
+++ b/src/util/virhostcpu.h
@@ -36,8 +36,7 @@ struct _virHostCPUTscInfo {
 
 int virHostCPUGetStats(int cpuNum,
                        virNodeCPUStatsPtr params,
-                       int *nparams,
-                       unsigned int flags);
+                       int *nparams);
 
 bool virHostCPUHasBitmap(void);
 virBitmap *virHostCPUGetPresentBitmap(void);
@@ -49,8 +48,7 @@ int virHostCPUGetCount(void);
 int virHostCPUGetThreadsPerSubcore(virArch arch) ATTRIBUTE_MOCKABLE;
 
 int virHostCPUGetMap(unsigned char **cpumap,
-                     unsigned int *online,
-                     unsigned int flags);
+                     unsigned int *online);
 int virHostCPUGetInfo(virArch hostarch,
                       unsigned int *cpus,
                       unsigned int *mhz,

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 2d8878fe7f0beaedad5857a55179193d428b099e..f8193367c9f43da128f1ddd68e2f21bef7c0dc2c 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -1000,10 +1000,12 @@ vzNodeGetCPUMap(virConnectPtr conn,
                 unsigned int *online,
                 unsigned int flags)
 {
+    virCheckFlags(0, -1);
+
     if (virNodeGetCPUMapEnsureACL(conn) < 0)
         return -1;
 
-    return virHostCPUGetMap(cpumap, online, flags);
+    return virHostCPUGetMap(cpumap, online);
 }
 
 static int
@@ -1964,10 +1966,12 @@ vzNodeGetCPUStats(virConnectPtr conn,
                   int *nparams,
                   unsigned int flags)
 {
+    virCheckFlags(0, -1);
+
     if (virNodeGetCPUStatsEnsureACL(conn) < 0)
         return -1;
 
-    return virHostCPUGetStats(cpuNum, params, nparams, flags);
+    return virHostCPUGetStats(cpuNum, params, nparams);
 }
 
 static int

diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c
index 4b31b794448439e90e6cf39e8fe2119fcca88dba..e362ee8d39e866d82f7573043309351c22644bda 100644 (file)
--- a/tests/virhostcputest.c
+++ b/tests/virhostcputest.c
@@ -249,7 +249,7 @@ linuxTestHostCPUGetMap(const void *data G_GNUC_UNUSED)
 {
     g_autofree unsigned char *cpumap = NULL;
 
-    int ncpus = virHostCPUGetMap(&cpumap, NULL, 0);
+    int ncpus = virHostCPUGetMap(&cpumap, NULL);
 
     g_autoptr(virBitmap) actual = virBitmapNewData(cpumap, VIR_DIV_UP(ncpus, 8));
     g_autoptr(virBitmap) expected = NULL;