virHostMemGet(Stats|Parameters): Remove unused 'flags'

The utility functions which get memory 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 2718c074f3b370c613fecd95a8204f4c31cf7b1e..88134130372aa6efd3cd02c679e789749b87c728 100644 (file)
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -1160,10 +1160,12 @@ bhyveNodeGetMemoryStats(virConnectPtr conn,
                         int *nparams,
                         unsigned int flags)
 {
+    virCheckFlags(0, -1);
+
     if (virNodeGetMemoryStatsEnsureACL(conn) < 0)
         return -1;
 
-    return virHostMemGetStats(cellNum, params, nparams, flags);
+    return virHostMemGetStats(cellNum, params, nparams);
 }
 
 static int
@@ -1375,10 +1377,12 @@ bhyveNodeGetMemoryParameters(virConnectPtr conn,
                              int *nparams,
                              unsigned int flags)
 {
+    virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1);
+
     if (virNodeGetMemoryParametersEnsureACL(conn) < 0)
         return -1;
 
-    return virHostMemGetParameters(params, nparams, flags);
+    return virHostMemGetParameters(params, nparams);
 }
 
 static int
@@ -1387,10 +1391,12 @@ bhyveNodeSetMemoryParameters(virConnectPtr conn,
                              int nparams,
                              unsigned int flags)
 {
+    virCheckFlags(0, -1);
+
     if (virNodeSetMemoryParametersEnsureACL(conn) < 0)
         return -1;
 
-    return virHostMemSetParameters(params, nparams, flags);
+    return virHostMemSetParameters(params, nparams);
 }
 
 static char *

diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c
index 874fca219303e5af0ace40028dbf9e655712990d..ff3cb55c693ca70cff56a88db8792ffdc49fede9 100644 (file)
--- a/src/ch/ch_driver.c
+++ b/src/ch/ch_driver.c
@@ -2304,10 +2304,12 @@ chNodeGetMemoryStats(virConnectPtr conn,
                      int *nparams,
                      unsigned int flags)
 {
+    virCheckFlags(0, -1);
+
     if (virNodeGetMemoryStatsEnsureACL(conn) < 0)
         return -1;
 
-    return virHostMemGetStats(cellNum, params, nparams, flags);
+    return virHostMemGetStats(cellNum, params, nparams);
 }
 
 static int

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 4ba54de2e4f24cbf847e61a1e89558e4c21d4fc8..42f50d897047071f34490de184d7da2418c53e46 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -4803,10 +4803,12 @@ lxcNodeGetMemoryStats(virConnectPtr conn,
                       int *nparams,
                       unsigned int flags)
 {
+    virCheckFlags(0, -1);
+
     if (virNodeGetMemoryStatsEnsureACL(conn) < 0)
         return -1;
 
-    return virHostMemGetStats(cellNum, params, nparams, flags);
+    return virHostMemGetStats(cellNum, params, nparams);
 }
 
 
@@ -4844,10 +4846,12 @@ lxcNodeGetMemoryParameters(virConnectPtr conn,
                            int *nparams,
                            unsigned int flags)
 {
+    virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1);
+
     if (virNodeGetMemoryParametersEnsureACL(conn) < 0)
         return -1;
 
-    return virHostMemGetParameters(params, nparams, flags);
+    return virHostMemGetParameters(params, nparams);
 }
 
 
@@ -4857,10 +4861,12 @@ lxcNodeSetMemoryParameters(virConnectPtr conn,
                            int nparams,
                            unsigned int flags)
 {
+    virCheckFlags(0, -1);
+
     if (virNodeSetMemoryParametersEnsureACL(conn) < 0)
         return -1;
 
-    return virHostMemSetParameters(params, nparams, flags);
+    return virHostMemSetParameters(params, nparams);
 }
 
 

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 60b8a9534babf36e63fa449bd768479bc47bfc0c..173ccfbe6e01c1f746674c966f1c39a1c9ad228f 100644 (file)
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -1862,7 +1862,9 @@ openvzNodeGetMemoryStats(virConnectPtr conn G_GNUC_UNUSED,
                          int *nparams,
                          unsigned int flags)
 {
-    return virHostMemGetStats(cellNum, params, nparams, flags);
+    virCheckFlags(0, -1);
+
+    return virHostMemGetStats(cellNum, params, nparams);
 }
 
 

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d16e1ffa975e804d380d957cfb3ec26d4fdc4ebd..4ec67f9f235a7522b8e778fcda7936c3f4012be4 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -16406,10 +16406,12 @@ qemuNodeGetMemoryStats(virConnectPtr conn,
                        int *nparams,
                        unsigned int flags)
 {
+    virCheckFlags(0, -1);
+
     if (virNodeGetMemoryStatsEnsureACL(conn) < 0)
         return -1;
 
-    return virHostMemGetStats(cellNum, params, nparams, flags);
+    return virHostMemGetStats(cellNum, params, nparams);
 }
 
 
@@ -16447,10 +16449,12 @@ qemuNodeGetMemoryParameters(virConnectPtr conn,
                             int *nparams,
                             unsigned int flags)
 {
+    virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1);
+
     if (virNodeGetMemoryParametersEnsureACL(conn) < 0)
         return -1;
 
-    return virHostMemGetParameters(params, nparams, flags);
+    return virHostMemGetParameters(params, nparams);
 }
 
 
@@ -16460,10 +16464,12 @@ qemuNodeSetMemoryParameters(virConnectPtr conn,
                             int nparams,
                             unsigned int flags)
 {
+    virCheckFlags(0, -1);
+
     if (virNodeSetMemoryParametersEnsureACL(conn) < 0)
         return -1;
 
-    return virHostMemSetParameters(params, nparams, flags);
+    return virHostMemSetParameters(params, nparams);
 }
 
 

diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c
index 09a322fdea5dd011ca502ccb1648a98eb9ec457c..7d7deac34bea18ce3c4fed831abdf19e22c32d82 100644 (file)
--- a/src/util/virhostmem.c
+++ b/src/util/virhostmem.c
@@ -248,11 +248,8 @@ virHostMemGetStatsLinux(FILE *meminfo,
 int
 virHostMemGetStats(int cellNum G_GNUC_UNUSED,
                    virNodeMemoryStatsPtr params G_GNUC_UNUSED,
-                   int *nparams G_GNUC_UNUSED,
-                   unsigned int flags)
+                   int *nparams G_GNUC_UNUSED)
 {
-    virCheckFlags(0, -1);
-
 #ifdef __linux__
     {
         int ret;
@@ -356,14 +353,11 @@ virHostMemParametersAreAllSupported(virTypedParameterPtr params,
 
 #ifdef __linux__
 int
-virHostMemSetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
-                        int nparams G_GNUC_UNUSED,
-                        unsigned int flags)
+virHostMemSetParameters(virTypedParameterPtr params,
+                        int nparams)
 {
     size_t i;
 
-    virCheckFlags(0, -1);
-
     if (virTypedParamsValidate(params, nparams,
                                VIR_NODE_MEMORY_SHARED_PAGES_TO_SCAN,
                                VIR_TYPED_PARAM_UINT,
@@ -387,11 +381,8 @@ virHostMemSetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
 #else
 int
 virHostMemSetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
-                        int nparams G_GNUC_UNUSED,
-                        unsigned int flags)
+                        int nparams G_GNUC_UNUSED)
 {
-    virCheckFlags(0, -1);
-
     virReportError(VIR_ERR_NO_SUPPORT, "%s",
                    _("node set memory parameters not implemented on this platform"));
     return -1;
@@ -443,9 +434,8 @@ virHostMemGetParameterValue(const char *field,
 #define NODE_MEMORY_PARAMETERS_NUM 8
 #ifdef __linux__
 int
-virHostMemGetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
-                        int *nparams G_GNUC_UNUSED,
-                        unsigned int flags)
+virHostMemGetParameters(virTypedParameterPtr params,
+                        int *nparams)
 {
     unsigned int pages_to_scan;
     unsigned int sleep_millisecs;
@@ -458,8 +448,6 @@ virHostMemGetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
     size_t i;
     int ret;
 
-    virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1);
-
     if ((*nparams) == 0) {
         *nparams = NODE_MEMORY_PARAMETERS_NUM;
         return 0;
@@ -580,11 +568,8 @@ virHostMemGetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
 #else
 int
 virHostMemGetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
-                        int *nparams G_GNUC_UNUSED,
-                        unsigned int flags)
+                        int *nparams G_GNUC_UNUSED)
 {
-    virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1);
-
     virReportError(VIR_ERR_NO_SUPPORT, "%s",
                    _("node get memory parameters not implemented on this platform"));
     return -1;

diff --git a/src/util/virhostmem.h b/src/util/virhostmem.h
index 5c8d46cfa428cbb0dfb97e0c4176ef7384f41cd4..4a0d692402e2be16e74e661d1509b30ec77d6948 100644 (file)
--- a/src/util/virhostmem.h
+++ b/src/util/virhostmem.h
@@ -25,8 +25,7 @@
 
 int virHostMemGetStats(int cellNum,
                        virNodeMemoryStatsPtr params,
-                       int *nparams,
-                       unsigned int flags);
+                       int *nparams);
 int virHostMemGetCellsFree(unsigned long long *freeMems,
                            int startCell,
                            int maxCells);
@@ -34,12 +33,10 @@ int virHostMemGetInfo(unsigned long long *mem,
                       unsigned long long *freeMem);
 
 int virHostMemGetParameters(virTypedParameterPtr params,
-                            int *nparams,
-                            unsigned int flags);
+                            int *nparams);
 
 int virHostMemSetParameters(virTypedParameterPtr params,
-                            int nparams,
-                            unsigned int flags);
+                            int nparams);
 
 int virHostMemGetFreePages(unsigned int npages,
                            unsigned int *pages,

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index f8193367c9f43da128f1ddd68e2f21bef7c0dc2c..3dea4d450d2d3ee7edfbb53a8e26c837695ca85a 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -1981,10 +1981,12 @@ vzNodeGetMemoryStats(virConnectPtr conn,
                      int *nparams,
                      unsigned int flags)
 {
+    virCheckFlags(0, -1);
+
     if (virNodeGetMemoryStatsEnsureACL(conn) < 0)
         return -1;
 
-    return virHostMemGetStats(cellNum, params, nparams, flags);
+    return virHostMemGetStats(cellNum, params, nparams);
 }
 
 static int