External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-04 20:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpc: Remove unused parameter in virKeepAliveStopInternal

Browse Source 
The previous commit removed the only usage of ``all'' parameter in
virKeepAliveStopInternal, which was actually the only reason for having
virKeepAliveStopInternal. This effectively reverts most of commit
6446a9e20c.
(cherry picked from commit 0ec514b359)
This commit is contained in:
Jiri Denemark 2012-06-12 08:58:04 +02:00 committed by Cole Robinson
parent 4d695acd86
commit 6180670cd2
4 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/probes.d
View File

@ -78,7 +78,7 @@ provider libvirt {
probe rpc_keepalive_ref(void *ka, void *client, int refs); probe rpc_keepalive_ref(void *ka, void *client, int refs);
probe rpc_keepalive_free(void *ka, void *client, int refs); probe rpc_keepalive_free(void *ka, void *client, int refs);
probe rpc_keepalive_start(void *ka, void *client, int interval, int count); probe rpc_keepalive_start(void *ka, void *client, int interval, int count);
probe rpc_keepalive_stop(void *ka, void *client, bool all); probe rpc_keepalive_stop(void *ka, void *client);
probe rpc_keepalive_send(void *ka, void *client, int prog, int vers, int proc); probe rpc_keepalive_send(void *ka, void *client, int prog, int vers, int proc);
probe rpc_keepalive_received(void *ka, void *client, int prog, int vers, int proc); probe rpc_keepalive_received(void *ka, void *client, int prog, int vers, int proc);
probe rpc_keepalive_timeout(void *ka, void *client, int coundToDeath, int idle); probe rpc_keepalive_timeout(void *ka, void *client, int coundToDeath, int idle);

22
src/rpc/virkeepalive.c
View File

@ -328,14 +328,14 @@ cleanup:
} }
static void void
virKeepAliveStopInternal(virKeepAlivePtr ka, bool all ATTRIBUTE_UNUSED) virKeepAliveStop(virKeepAlivePtr ka)
{ {
virKeepAliveLock(ka); virKeepAliveLock(ka);
PROBE(RPC_KEEPALIVE_STOP, PROBE(RPC_KEEPALIVE_STOP,
"ka=%p client=%p all=%d", "ka=%p client=%p",
ka, ka->client, all); ka, ka->client);
if (ka->timer > 0) { if (ka->timer > 0) {
virEventRemoveTimeout(ka->timer); virEventRemoveTimeout(ka->timer);
@ -346,20 +346,6 @@ virKeepAliveStopInternal(virKeepAlivePtr ka, bool all ATTRIBUTE_UNUSED)
} }
void
virKeepAliveStop(virKeepAlivePtr ka)
{
virKeepAliveStopInternal(ka, true);
}
void
virKeepAliveStopSending(virKeepAlivePtr ka)
{
virKeepAliveStopInternal(ka, false);
}
int int
virKeepAliveTimeout(virKeepAlivePtr ka) virKeepAliveTimeout(virKeepAlivePtr ka)
{ {

1
src/rpc/virkeepalive.h
View File

@ -49,7 +49,6 @@ int virKeepAliveStart(virKeepAlivePtr ka,
int interval, int interval,
unsigned int count); unsigned int count);
void virKeepAliveStop(virKeepAlivePtr ka); void virKeepAliveStop(virKeepAlivePtr ka);
void virKeepAliveStopSending(virKeepAlivePtr ka);
int virKeepAliveTimeout(virKeepAlivePtr ka); int virKeepAliveTimeout(virKeepAlivePtr ka);
bool virKeepAliveTrigger(virKeepAlivePtr ka, bool virKeepAliveTrigger(virKeepAlivePtr ka,

2
src/rpc/virnetclient.c
View File

@ -257,7 +257,7 @@ void
virNetClientKeepAliveStop(virNetClientPtr client) virNetClientKeepAliveStop(virNetClientPtr client)
{ {
virNetClientLock(client); virNetClientLock(client);
virKeepAliveStopSending(client->keepalive); virKeepAliveStop(client->keepalive);
virNetClientUnlock(client); virNetClientUnlock(client);
} }