External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

remote: rename protocol names for close callbacks

Browse Source 
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>
This commit is contained in:
Nikolay Shirokovskiy 2016-06-24 17:32:37 +03:00 committed by Maxim Nestratov
parent 5a435726ef
commit 0adc9d26ae
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/remote.c
View File

@ -3652,7 +3652,7 @@ remoteDispatchNodeDeviceGetParent(virNetServerPtr server ATTRIBUTE_UNUSED,
} }
static int static int
remoteDispatchConnectCloseCallbackRegister(virNetServerPtr server ATTRIBUTE_UNUSED, remoteDispatchConnectRegisterCloseCallback(virNetServerPtr server ATTRIBUTE_UNUSED,
virNetServerClientPtr client, virNetServerClientPtr client,
virNetMessagePtr msg ATTRIBUTE_UNUSED, virNetMessagePtr msg ATTRIBUTE_UNUSED,
virNetMessageErrorPtr rerr) virNetMessageErrorPtr rerr)
@ -3684,7 +3684,7 @@ remoteDispatchConnectCloseCallbackRegister(virNetServerPtr server ATTRIBUTE_UNUS
} }
static int static int
remoteDispatchConnectCloseCallbackUnregister(virNetServerPtr server ATTRIBUTE_UNUSED, remoteDispatchConnectUnregisterCloseCallback(virNetServerPtr server ATTRIBUTE_UNUSED,
virNetServerClientPtr client, virNetServerClientPtr client,
virNetMessagePtr msg ATTRIBUTE_UNUSED, virNetMessagePtr msg ATTRIBUTE_UNUSED,
virNetMessageErrorPtr rerr) virNetMessageErrorPtr rerr)

4
src/remote/remote_driver.c
View File

@ -7715,7 +7715,7 @@ remoteConnectRegisterCloseCallback(virConnectPtr conn,
} }
if (priv->serverCloseCallback && 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,
(xdrproc_t) xdr_void, (char *) NULL) == -1) (xdrproc_t) xdr_void, (char *) NULL) == -1)
goto cleanup; goto cleanup;
@ -7746,7 +7746,7 @@ remoteConnectUnregisterCloseCallback(virConnectPtr conn,
} }
if (priv->serverCloseCallback && 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,
(xdrproc_t) xdr_void, (char *) NULL) == -1) (xdrproc_t) xdr_void, (char *) NULL) == -1)
goto cleanup; goto cleanup;

4
src/remote/remote_protocol.x
View File

@ -5826,13 +5826,13 @@ enum remote_procedure {
* @generate: none * @generate: none
* @acl: none * @acl: none
*/ */
REMOTE_PROC_CONNECT_CLOSE_CALLBACK_REGISTER = 360, REMOTE_PROC_CONNECT_REGISTER_CLOSE_CALLBACK = 360,
/** /**
* @generate: none * @generate: none
* @acl: none * @acl: none
*/ */
REMOTE_PROC_CONNECT_CLOSE_CALLBACK_UNREGISTER = 361, REMOTE_PROC_CONNECT_UNREGISTER_CLOSE_CALLBACK = 361,
/** /**
* @generate: none * @generate: none