From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 3 Aug 2020 15:58:03 +0000 (+0200)
Subject: util: virHostMem*Parameters: split out non-Linux stubs
X-Git-Tag: v6.7.0-rc1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8c9584aed992ffc29b5c17f1fb4f84bd2333eda;p=thirdparty%2Flibvirt.git

util: virHostMem*Parameters: split out non-Linux stubs

Repeat the whole function header instead of mixing #ifdefs
in the code.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c
index 7d1871610c..27f192dc24 100644
--- a/src/util/virhostmem.c
+++ b/src/util/virhostmem.c
@@ -354,16 +354,16 @@ virHostMemParametersAreAllSupported(virTypedParameterPtr params,
 }
 #endif
 
+#ifdef __linux__
 int
 virHostMemSetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
                         int nparams G_GNUC_UNUSED,
                         unsigned int flags)
 {
-    virCheckFlags(0, -1);
-
-#ifdef __linux__
     size_t i;
 
+    virCheckFlags(0, -1);
+
     if (virTypedParamsValidate(params, nparams,
                                VIR_NODE_MEMORY_SHARED_PAGES_TO_SCAN,
                                VIR_TYPED_PARAM_UINT,
@@ -383,13 +383,21 @@ virHostMemSetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
     }
 
     return 0;
+}
 #else
+int
+virHostMemSetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
+                        int nparams G_GNUC_UNUSED,
+                        unsigned int flags)
+{
+    virCheckFlags(0, -1);
+
     virReportError(VIR_ERR_NO_SUPPORT, "%s",
                    _("node set memory parameters not implemented"
                      " on this platform"));
     return -1;
-#endif
 }
+#endif
 
 #ifdef __linux__
 static int
@@ -434,14 +442,12 @@ virHostMemGetParameterValue(const char *field,
 #endif
 
 #define NODE_MEMORY_PARAMETERS_NUM 8
+#ifdef __linux__
 int
 virHostMemGetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
                         int *nparams G_GNUC_UNUSED,
                         unsigned int flags)
 {
-    virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1);
-
-#ifdef __linux__
     unsigned int pages_to_scan;
     unsigned int sleep_millisecs;
     unsigned int merge_across_nodes;
@@ -453,6 +459,8 @@ 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;
@@ -569,13 +577,21 @@ virHostMemGetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
     }
 
     return 0;
+}
 #else
+int
+virHostMemGetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
+                        int *nparams G_GNUC_UNUSED,
+                        unsigned int flags)
+{
+    virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1);
+
     virReportError(VIR_ERR_NO_SUPPORT, "%s",
                    _("node get memory parameters not implemented"
                      " on this platform"));
     return -1;
-#endif
 }
+#endif
 
 
 #ifdef WIN32