diff --git a/src/libvirt_probes.d b/src/libvirt_probes.d index ac6c5462292f26ef7df601ae6f705e8e8e22fc3e..0dac8f35d318c5607a87e997d49e86d211dd7725 100644 --- a/src/libvirt_probes.d +++ b/src/libvirt_probes.d @@ -78,7 +78,7 @@ provider libvirt { probe rpc_keepalive_ref(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_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_received(void *ka, void *client, int prog, int vers, int proc); probe rpc_keepalive_timeout(void *ka, void *client, int coundToDeath, int idle); diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index 7984adad71a2274d9767772a01fe1f4d8e50e405..70cf31ed9fcbe4dbabb21f2923475099247b15e7 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -328,14 +328,14 @@ cleanup: } -static void -virKeepAliveStopInternal(virKeepAlivePtr ka, bool all ATTRIBUTE_UNUSED) +void +virKeepAliveStop(virKeepAlivePtr ka) { virKeepAliveLock(ka); PROBE(RPC_KEEPALIVE_STOP, - "ka=%p client=%p all=%d", - ka, ka->client, all); + "ka=%p client=%p", + ka, ka->client); if (ka->timer > 0) { 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 virKeepAliveTimeout(virKeepAlivePtr ka) { diff --git a/src/rpc/virkeepalive.h b/src/rpc/virkeepalive.h index 62227d06842f28bd3480d0da16d1a61acdde94ed..1e2521423bb4f1f342bc623d7a5ac5277524fc09 100644 --- a/src/rpc/virkeepalive.h +++ b/src/rpc/virkeepalive.h @@ -49,7 +49,6 @@ int virKeepAliveStart(virKeepAlivePtr ka, int interval, unsigned int count); void virKeepAliveStop(virKeepAlivePtr ka); -void virKeepAliveStopSending(virKeepAlivePtr ka); int virKeepAliveTimeout(virKeepAlivePtr ka); bool virKeepAliveTrigger(virKeepAlivePtr ka, diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 48c6a5dc56016f88ef27171a5cf028baf75da4aa..25bafea29e5cb076a857d1ff9394b883c2f65dd9 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -257,7 +257,7 @@ void virNetClientKeepAliveStop(virNetClientPtr client) { virNetClientLock(client); - virKeepAliveStopSending(client->keepalive); + virKeepAliveStop(client->keepalive); virNetClientUnlock(client); }