[PATCH v2 16/22] rpc: rename virNetDaemonSetShutdownCallbacks

[Daniel P. Berrangé <berrange@xxxxxxxxxx>]

The next patch will be introducing a new callback, so rename the method
to virNetDaemonSetLifecycleCallbacks to reflect the more general usage.

Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
---
 src/libvirt_remote.syms    |  2 +-
 src/remote/remote_daemon.c |  6 +++---
 src/rpc/virnetdaemon.c     | 10 +++++-----
 src/rpc/virnetdaemon.h     |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms
index f0f90815cf..c4053fdcb2 100644
--- a/src/libvirt_remote.syms
+++ b/src/libvirt_remote.syms
@@ -94,7 +94,7 @@ virNetDaemonQuit;
 virNetDaemonQuitExecRestart;
 virNetDaemonRemoveShutdownInhibition;
 virNetDaemonRun;
-virNetDaemonSetShutdownCallbacks;
+virNetDaemonSetLifecycleCallbacks;
 virNetDaemonSetStateStopWorkerThread;
 virNetDaemonUpdateServices;
 
diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index 2f6cef1828..9c0025a3bc 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -624,9 +624,9 @@ static void daemonRunStateInit(void *opaque)
 
     g_atomic_int_set(&driversInitialized, 1);
 
-    virNetDaemonSetShutdownCallbacks(dmn,
-                                     virStateShutdownPrepare,
-                                     virStateShutdownWait);
+    virNetDaemonSetLifecycleCallbacks(dmn,
+                                      virStateShutdownPrepare,
+                                      virStateShutdownWait);
 
     /* Signal for VM shutdown when desktop session is terminated, in
      * unprivileged daemons */
diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c
index e6bdfe0f88..6d20edf28b 100644
--- a/src/rpc/virnetdaemon.c
+++ b/src/rpc/virnetdaemon.c
@@ -65,8 +65,8 @@ struct _virNetDaemon {
     GHashTable *servers;
     virJSONValue *srvObject;
 
-    virNetDaemonShutdownCallback shutdownPrepareCb;
-    virNetDaemonShutdownCallback shutdownWaitCb;
+    virNetDaemonLifecycleCallback shutdownPrepareCb;
+    virNetDaemonLifecycleCallback shutdownWaitCb;
     virThread *stateStopThread;
     int finishTimer;
     bool quit;
@@ -873,9 +873,9 @@ virNetDaemonHasClients(virNetDaemon *dmn)
 }
 
 void
-virNetDaemonSetShutdownCallbacks(virNetDaemon *dmn,
-                                 virNetDaemonShutdownCallback prepareCb,
-                                 virNetDaemonShutdownCallback waitCb)
+virNetDaemonSetLifecycleCallbacks(virNetDaemon *dmn,
+                                  virNetDaemonLifecycleCallback prepareCb,
+                                  virNetDaemonLifecycleCallback waitCb)
 {
     VIR_LOCK_GUARD lock = virObjectLockGuard(dmn);
 
diff --git a/src/rpc/virnetdaemon.h b/src/rpc/virnetdaemon.h
index 31a355adb4..0f4ebb6df7 100644
--- a/src/rpc/virnetdaemon.h
+++ b/src/rpc/virnetdaemon.h
@@ -82,8 +82,8 @@ ssize_t virNetDaemonGetServers(virNetDaemon *dmn, virNetServer ***servers);
 bool virNetDaemonHasServer(virNetDaemon *dmn,
                            const char *serverName);
 
-typedef int (*virNetDaemonShutdownCallback)(void);
+typedef int (*virNetDaemonLifecycleCallback)(void);
 
-void virNetDaemonSetShutdownCallbacks(virNetDaemon *dmn,
-                                      virNetDaemonShutdownCallback prepareCb,
-                                      virNetDaemonShutdownCallback waitCb);
+void virNetDaemonSetLifecycleCallbacks(virNetDaemon *dmn,
+                                       virNetDaemonLifecycleCallback prepareCb,
+                                       virNetDaemonLifecycleCallback waitCb);
-- 
2.48.1