|
 |
6ae9ed |
From 8bd8ba893d25a4d3f847e982de13f180b716b090 Mon Sep 17 00:00:00 2001
|
|
|
6ae9ed |
Message-Id: <8bd8ba893d25a4d3f847e982de13f180b716b090@dist-git>
|
|
|
6ae9ed |
From: Erik Skultety <eskultet@redhat.com>
|
|
|
6ae9ed |
Date: Tue, 2 Aug 2016 15:20:50 +0200
|
|
|
6ae9ed |
Subject: [PATCH] rpc: virnetserver: Rename ClientSetProcessingControls to
|
|
|
6ae9ed |
ClientSetLimits
|
|
|
6ae9ed |
|
|
|
6ae9ed |
The original naming was just a leftover that should have been fixed in commit
|
|
|
6ae9ed |
8b1f0469.
|
|
|
6ae9ed |
|
|
|
6ae9ed |
Signed-off-by: Erik Skultety <eskultet@redhat.com>
|
|
|
6ae9ed |
(cherry picked from commit 2e5417bc466b7a12d72136cdd5f406301ec101d0)
|
|
|
6ae9ed |
|
|
|
6ae9ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1357776
|
|
|
6ae9ed |
Signed-off-by: Erik Skultety <eskultet@redhat.com>
|
|
|
6ae9ed |
---
|
|
|
6ae9ed |
daemon/admin_server.c | 4 ++--
|
|
|
6ae9ed |
src/rpc/virnetserver.c | 6 +++---
|
|
|
6ae9ed |
src/rpc/virnetserver.h | 6 +++---
|
|
|
6ae9ed |
3 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
6ae9ed |
|
|
|
6ae9ed |
diff --git a/daemon/admin_server.c b/daemon/admin_server.c
|
|
|
6ae9ed |
index 5bbf229..d8a3323 100644
|
|
|
6ae9ed |
--- a/daemon/admin_server.c
|
|
|
6ae9ed |
+++ b/daemon/admin_server.c
|
|
|
6ae9ed |
@@ -382,8 +382,8 @@ adminServerSetClientLimits(virNetServerPtr srv,
|
|
|
6ae9ed |
VIR_SERVER_CLIENTS_UNAUTH_MAX)))
|
|
|
6ae9ed |
maxClientsUnauth = param->value.ui;
|
|
|
6ae9ed |
|
|
|
6ae9ed |
- if (virNetServerSetClientProcessingControls(srv, maxClients,
|
|
|
6ae9ed |
- maxClientsUnauth) < 0)
|
|
|
6ae9ed |
+ if (virNetServerSetClientLimits(srv, maxClients,
|
|
|
6ae9ed |
+ maxClientsUnauth) < 0)
|
|
|
6ae9ed |
return -1;
|
|
|
6ae9ed |
|
|
|
6ae9ed |
return 0;
|
|
|
6ae9ed |
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
|
|
|
6ae9ed |
index 8c8af97..13b5bd3 100644
|
|
|
6ae9ed |
--- a/src/rpc/virnetserver.c
|
|
|
6ae9ed |
+++ b/src/rpc/virnetserver.c
|
|
|
6ae9ed |
@@ -1046,9 +1046,9 @@ virNetServerGetClient(virNetServerPtr srv,
|
|
|
6ae9ed |
}
|
|
|
6ae9ed |
|
|
|
6ae9ed |
int
|
|
|
6ae9ed |
-virNetServerSetClientProcessingControls(virNetServerPtr srv,
|
|
|
6ae9ed |
- long long int maxClients,
|
|
|
6ae9ed |
- long long int maxClientsUnauth)
|
|
|
6ae9ed |
+virNetServerSetClientLimits(virNetServerPtr srv,
|
|
|
6ae9ed |
+ long long int maxClients,
|
|
|
6ae9ed |
+ long long int maxClientsUnauth)
|
|
|
6ae9ed |
{
|
|
|
6ae9ed |
int ret = -1;
|
|
|
6ae9ed |
size_t max, max_unauth;
|
|
|
6ae9ed |
diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h
|
|
|
6ae9ed |
index 38107b4..151bac8 100644
|
|
|
6ae9ed |
--- a/src/rpc/virnetserver.h
|
|
|
6ae9ed |
+++ b/src/rpc/virnetserver.h
|
|
|
6ae9ed |
@@ -116,8 +116,8 @@ size_t virNetServerGetCurrentClients(virNetServerPtr srv);
|
|
|
6ae9ed |
size_t virNetServerGetMaxUnauthClients(virNetServerPtr srv);
|
|
|
6ae9ed |
size_t virNetServerGetCurrentUnauthClients(virNetServerPtr srv);
|
|
|
6ae9ed |
|
|
|
6ae9ed |
-int virNetServerSetClientProcessingControls(virNetServerPtr srv,
|
|
|
6ae9ed |
- long long int maxClients,
|
|
|
6ae9ed |
- long long int maxClientsUnauth);
|
|
|
6ae9ed |
+int virNetServerSetClientLimits(virNetServerPtr srv,
|
|
|
6ae9ed |
+ long long int maxClients,
|
|
|
6ae9ed |
+ long long int maxClientsUnauth);
|
|
|
6ae9ed |
|
|
|
6ae9ed |
#endif /* __VIR_NET_SERVER_H__ */
|
|
|
6ae9ed |
--
|
|
|
6ae9ed |
2.9.2
|
|
|
6ae9ed |
|