remote: rename protocol names for close callbacks

This way we make naming consistent to API calls and make subsequent
ACL checks possible (otherwise ACL check would discover name
discrepancies).

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>

diff --git a/daemon/remote.c b/daemon/remote.c
index 155e9b047d1a2381ce5f2648ba8c8365eaf46ab6..e414f920e1b5dd89b87d4cc9843ebd9fc154757c 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -3652,7 +3652,7 @@ remoteDispatchNodeDeviceGetParent(virNetServerPtr server ATTRIBUTE_UNUSED,
 }
 
 static int
-remoteDispatchConnectCloseCallbackRegister(virNetServerPtr server ATTRIBUTE_UNUSED,
+remoteDispatchConnectRegisterCloseCallback(virNetServerPtr server ATTRIBUTE_UNUSED,
                                            virNetServerClientPtr client,
                                            virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                            virNetMessageErrorPtr rerr)
@@ -3684,7 +3684,7 @@ remoteDispatchConnectCloseCallbackRegister(virNetServerPtr server ATTRIBUTE_UNUS
 }
 
 static int
-remoteDispatchConnectCloseCallbackUnregister(virNetServerPtr server ATTRIBUTE_UNUSED,
+remoteDispatchConnectUnregisterCloseCallback(virNetServerPtr server ATTRIBUTE_UNUSED,
                                              virNetServerClientPtr client,
                                              virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                              virNetMessageErrorPtr rerr)

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 68b843442fc5aed3dac6c5c9e4f0b70c50d14400..3b8b796f0cce85f5fbf8d058cf68b36f6caf8ea4 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -7715,7 +7715,7 @@ remoteConnectRegisterCloseCallback(virConnectPtr conn,
     }
 
     if (priv->serverCloseCallback &&
-        call(conn, priv, 0, REMOTE_PROC_CONNECT_CLOSE_CALLBACK_REGISTER,
+        call(conn, priv, 0, REMOTE_PROC_CONNECT_REGISTER_CLOSE_CALLBACK,
              (xdrproc_t) xdr_void, (char *) NULL,
              (xdrproc_t) xdr_void, (char *) NULL) == -1)
         goto cleanup;
@@ -7746,7 +7746,7 @@ remoteConnectUnregisterCloseCallback(virConnectPtr conn,
     }
 
     if (priv->serverCloseCallback &&
-        call(conn, priv, 0, REMOTE_PROC_CONNECT_CLOSE_CALLBACK_UNREGISTER,
+        call(conn, priv, 0, REMOTE_PROC_CONNECT_UNREGISTER_CLOSE_CALLBACK,
              (xdrproc_t) xdr_void, (char *) NULL,
              (xdrproc_t) xdr_void, (char *) NULL) == -1)
         goto cleanup;

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 49db0717efd1e8bd14fcb44a3c2c111597456d9c..b779a2290649f3a1e028d878b3cbb68b608109d9 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -5826,13 +5826,13 @@ enum remote_procedure {
      * @generate: none
      * @acl: none
      */
-    REMOTE_PROC_CONNECT_CLOSE_CALLBACK_REGISTER = 360,
+    REMOTE_PROC_CONNECT_REGISTER_CLOSE_CALLBACK = 360,
 
     /**
      * @generate: none
      * @acl: none
      */
-    REMOTE_PROC_CONNECT_CLOSE_CALLBACK_UNREGISTER = 361,
+    REMOTE_PROC_CONNECT_UNREGISTER_CLOSE_CALLBACK = 361,
 
     /**
      * @generate: none