rpc: rename virNetDaemonSetShutdownCallbacks

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

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms
index f0f90815cf352d2a5c49a91d4140283498cbd2d6..c4053fdcb246ee79db652b0ac762f5dfb07cde85 100644 (file)
--- 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 2f6cef1828ff37a18ae62c6a059063bbe5eee0b1..9c0025a3bcc6f3bb69f1a950cab4e3f5db28955e 100644 (file)
--- 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 e6bdfe0f88ccfb2d4b818cfa00827a1ffbf66bff..6d20edf28bb991023a8945c882567375cbfb5425 100644 (file)
--- 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 31a355adb4114c1eb453efe121d5f955470e1a27..0f4ebb6df701d891078fdd5e51dde3a959972a5d 100644 (file)
--- 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);