From 0adc9d26ae0cfbb4aa227e89424f3d48bb977da0 Mon Sep 17 00:00:00 2001 From: Nikolay Shirokovskiy Date: Fri, 24 Jun 2016 17:32:37 +0300 Subject: [PATCH] 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 --- 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 155e9b047d..e414f920e1 100644 --- 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 68b843442f..3b8b796f0c 100644 --- 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 49db0717ef..b779a22906 100644 --- 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 -- GitLab