External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

libvirtd: rename virNetServerClient callback impls to match type names

Browse Source 
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2018-01-22 18:29:55 +00:00 committed by Daniel P. Berrangé
parent b1e03dad86
commit 99d69f6925
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
daemon/libvirtd.c
View File

@ -1311,9 +1311,9 @@ int main(int argc, char **argv) {
config->keepalive_interval,
config->keepalive_count,
config->mdns_adv ? config->mdns_name : NULL,
remoteClientInitHook,
remoteClientNew,
NULL,
remoteClientFreeFunc,
remoteClientFree,
NULL))) {
ret = VIR_DAEMON_ERR_INIT;
goto cleanup;
@ -1385,9 +1385,9 @@ int main(int argc, char **argv) {
config->admin_keepalive_interval,
config->admin_keepalive_count,
NULL,
remoteAdmClientInitHook,
remoteAdmClientNew,
NULL,
remoteAdmClientFreeFunc,
remoteAdmClientFree,
dmn))) {
ret = VIR_DAEMON_ERR_INIT;
goto cleanup;

6
daemon/remote.c
View File

@ -1734,7 +1734,7 @@ remoteClientFreePrivateCallbacks(struct daemonClientPrivate *priv)
* We keep the libvirt connection open until any async
* jobs have finished, then clean it up elsewhere
*/
void remoteClientFreeFunc(void *data)
void remoteClientFree(void *data)
{
struct daemonClientPrivate *priv = data;
@ -1757,8 +1757,8 @@ static void remoteClientCloseFunc(virNetServerClientPtr client)
}
void *remoteClientInitHook(virNetServerClientPtr client,
void *opaque ATTRIBUTE_UNUSED)
void *remoteClientNew(virNetServerClientPtr client,
void *opaque ATTRIBUTE_UNUSED)
{
struct daemonClientPrivate *priv;

6
daemon/remote.h
View File

@ -38,8 +38,8 @@ extern size_t lxcNProcs;
extern virNetServerProgramProc qemuProcs[];
extern size_t qemuNProcs;
void remoteClientFreeFunc(void *data);
void *remoteClientInitHook(virNetServerClientPtr client,
void *opaque);
void remoteClientFree(void *data);
void *remoteClientNew(virNetServerClientPtr client,
void *opaque);
#endif /* __LIBVIRTD_REMOTE_H__ */

6
src/admin/admin_server_dispatch.c
View File

@ -52,7 +52,7 @@ struct daemonAdmClientPrivate {
};
void
remoteAdmClientFreeFunc(void *data)
remoteAdmClientFree(void *data)
{
struct daemonAdmClientPrivate *priv = data;
@ -62,8 +62,8 @@ remoteAdmClientFreeFunc(void *data)
}
void *
remoteAdmClientInitHook(virNetServerClientPtr client ATTRIBUTE_UNUSED,
void *opaque)
remoteAdmClientNew(virNetServerClientPtr client ATTRIBUTE_UNUSED,
void *opaque)
{
struct daemonAdmClientPrivate *priv;

4
src/admin/admin_server_dispatch.h
View File

@ -31,7 +31,7 @@
extern virNetServerProgramProc adminProcs[];
extern size_t adminNProcs;
void remoteAdmClientFreeFunc(void *data);
void *remoteAdmClientInitHook(virNetServerClientPtr client, void *opaque);
void remoteAdmClientFree(void *data);
void *remoteAdmClientNew(virNetServerClientPtr client, void *opaque);
#endif /* __ADMIN_SERVER_DISPATCH_H__ */