[libvirt] [PATCH 8/9] remote: rename protocol names for close callbacks

Nikolay Shirokovskiy nshirokovskiy at virtuozzo.com
Fri Jun 24 14:32:37 UTC 2016


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 at virtuozzo.com>
---
 daemon/remote.c              | 4 ++--
 src/remote/remote_driver.c   | 4 ++--
 src/remote/remote_protocol.x | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/daemon/remote.c b/daemon/remote.c
index 4e2aff8..2c71315 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -3517,7 +3517,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)
@@ -3549,7 +3549,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 3f9d812..0457e21 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -7540,7 +7540,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;
@@ -7571,7 +7571,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 d11bfdf..e7a7025 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -5796,13 +5796,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
-- 
1.8.3.1




More information about the libvir-list mailing list