[libvirt] [PATCH 18/23] util: Fix naming in util/virnodesuspend

[Martin Kletzander]

That file has only two exported files and each one of them has
different naming.  virNode is what all the other files use, so let's
use it.  It wasn't used before because the clash with public API
naming, so let's fix that by shortening the name (there is no other
private variant of it anyway).

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 src/libvirt_private.syms  |  2 +-
 src/lxc/lxc_driver.c      |  2 +-
 src/qemu/qemu_driver.c    |  2 +-
 src/uml/uml_driver.c      |  2 +-
 src/util/virnodesuspend.c | 20 +++++++++++---------
 src/util/virnodesuspend.h |  6 +++---
 src/xen/xen_driver.c      |  2 +-
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 06de179554ab..0d3a68a92b87 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2170,7 +2170,7 @@ virNetlinkStartup;


 # util/virnodesuspend.h
-nodeSuspendForDuration;
+virNodeSuspend;
 virNodeSuspendGetTargetMask;


diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index ecd5fbdd4de1..27b4b75d8b0f 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -5342,7 +5342,7 @@ lxcNodeSuspendForDuration(virConnectPtr conn,
     if (virNodeSuspendForDurationEnsureACL(conn) < 0)
         return -1;

-    return nodeSuspendForDuration(target, duration, flags);
+    return virNodeSuspend(target, duration, flags);
 }


diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 98f0586ce26b..2adbd167b45f 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -18402,7 +18402,7 @@ qemuNodeSuspendForDuration(virConnectPtr conn,
     if (virNodeSuspendForDurationEnsureACL(conn) < 0)
         return -1;

-    return nodeSuspendForDuration(target, duration, flags);
+    return virNodeSuspend(target, duration, flags);
 }

 static int
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index f03fdbf68fd6..532ce3b1f347 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -2877,7 +2877,7 @@ umlNodeSuspendForDuration(virConnectPtr conn,
     if (virNodeSuspendForDurationEnsureACL(conn) < 0)
         return -1;

-    return nodeSuspendForDuration(target, duration, flags);
+    return virNodeSuspend(target, duration, flags);
 }


diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c
index 71b2d4cb7d2b..0af0908e4ae1 100644
--- a/src/util/virnodesuspend.c
+++ b/src/util/virnodesuspend.c
@@ -96,23 +96,23 @@ static int virNodeSuspendSetNodeWakeup(unsigned long long alarmTime)
 }

 /**
- * virNodeSuspend:
+ * virNodeSuspendHelper:
  * @cmdString: pointer to the command string this thread has to execute.
  *
  * Actually perform the suspend operation by invoking the command.
  * Give a short delay before executing the command so as to give a chance
- * to virNodeSuspendForDuration() to return the status to the caller.
+ * to virNodeSuspend() to return the status to the caller.
  * If we don't give this delay, that function will not be able to return
  * the status, since the suspend operation would have begun and hence no
  * data can be sent through the connection to the caller. However, with
  * this delay added, the status return is best-effort only.
  */
-static void virNodeSuspend(void *cmdString)
+static void virNodeSuspendHelper(void *cmdString)
 {
     virCommandPtr suspendCmd = virCommandNew((const char *)cmdString);

     /*
-     * Delay for sometime so that the function nodeSuspendForDuration()
+     * Delay for sometime so that the function virNodeSuspend()
      * can return the status to the caller.
      */
     sleep(SUSPEND_DELAY);
@@ -131,7 +131,7 @@ static void virNodeSuspend(void *cmdString)
 }

 /**
- * nodeSuspendForDuration:
+ * virNodeSuspend:
  * @conn: pointer to the hypervisor connection
  * @target: the state to which the host must be suspended to -
  *         VIR_NODE_SUSPEND_TARGET_MEM       (Suspend-to-RAM),
@@ -157,9 +157,9 @@ static void virNodeSuspend(void *cmdString)
  * -1 if suspending the node is not supported, or if a previous suspend
  * operation is still in progress.
  */
-int nodeSuspendForDuration(unsigned int target,
-                           unsigned long long duration,
-                           unsigned int flags)
+int virNodeSuspend(unsigned int target,
+                   unsigned long long duration,
+                   unsigned int flags)
 {
     static virThread thread;
     const char *cmdString = NULL;
@@ -219,7 +219,9 @@ int nodeSuspendForDuration(unsigned int target,
     if (virNodeSuspendSetNodeWakeup(duration) < 0)
         goto cleanup;

-    if (virThreadCreate(&thread, false, virNodeSuspend, (void *)cmdString) < 0) {
+    if (virThreadCreate(&thread, false,
+                        virNodeSuspendHelper,
+                        (void *)cmdString) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("Failed to create thread to suspend the host"));
         goto cleanup;
diff --git a/src/util/virnodesuspend.h b/src/util/virnodesuspend.h
index b5f67dde0c31..85941bf1ab1e 100644
--- a/src/util/virnodesuspend.h
+++ b/src/util/virnodesuspend.h
@@ -25,9 +25,9 @@

 # include "internal.h"

-int nodeSuspendForDuration(unsigned int target,
-                           unsigned long long duration,
-                           unsigned int flags);
+int virNodeSuspend(unsigned int target,
+                   unsigned long long duration,
+                   unsigned int flags);

 int virNodeSuspendGetTargetMask(unsigned int *bitmask);

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 5a94ad79e64c..7a2f4a1a60f0 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -2596,7 +2596,7 @@ xenUnifiedNodeSuspendForDuration(virConnectPtr conn,
     if (virNodeSuspendForDurationEnsureACL(conn) < 0)
         return -1;

-    return nodeSuspendForDuration(target, duration, flags);
+    return virNodeSuspend(target, duration, flags);
 }


-- 
2.12.0