|
 |
8d9645 |
From 2608c9a951caed5ebec7ad36571c5adb6671b855 Mon Sep 17 00:00:00 2001
|
|
|
8d9645 |
From: Martin Kletzander <mkletzan@redhat.com>
|
|
|
8d9645 |
Date: Tue, 1 Mar 2016 15:42:32 +0100
|
|
|
8d9645 |
Subject: [PATCH] daemon: properly check for clients
|
|
|
8d9645 |
|
|
|
8d9645 |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
8d9645 |
(cherry picked from commit 78b0ccc71e99f769068974ff56638c99b1c3b4de)
|
|
|
8d9645 |
---
|
|
|
8d9645 |
src/rpc/virnetdaemon.c | 14 +++++++++++---
|
|
|
8d9645 |
1 file changed, 11 insertions(+), 3 deletions(-)
|
|
|
8d9645 |
|
|
|
8d9645 |
diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c
|
|
|
8d9645 |
index 298fbf4..b05ba99 100644
|
|
|
8d9645 |
--- a/src/rpc/virnetdaemon.c
|
|
|
8d9645 |
+++ b/src/rpc/virnetdaemon.c
|
|
|
8d9645 |
@@ -843,15 +843,23 @@ virNetDaemonClose(virNetDaemonPtr dmn)
|
|
|
8d9645 |
static int
|
|
|
8d9645 |
daemonServerHasClients(void *payload,
|
|
|
8d9645 |
const void *key ATTRIBUTE_UNUSED,
|
|
|
8d9645 |
- void *opaque ATTRIBUTE_UNUSED)
|
|
|
8d9645 |
+ void *opaque)
|
|
|
8d9645 |
{
|
|
|
8d9645 |
+ bool *clients = opaque;
|
|
|
8d9645 |
virNetServerPtr srv = payload;
|
|
|
8d9645 |
|
|
|
8d9645 |
- return virNetServerHasClients(srv);
|
|
|
8d9645 |
+ if (virNetServerHasClients(srv))
|
|
|
8d9645 |
+ *clients = true;
|
|
|
8d9645 |
+
|
|
|
8d9645 |
+ return 0;
|
|
|
8d9645 |
}
|
|
|
8d9645 |
|
|
|
8d9645 |
bool
|
|
|
8d9645 |
virNetDaemonHasClients(virNetDaemonPtr dmn)
|
|
|
8d9645 |
{
|
|
|
8d9645 |
- return virHashForEach(dmn->servers, daemonServerHasClients, NULL) > 0;
|
|
|
8d9645 |
+ bool ret = false;
|
|
|
8d9645 |
+
|
|
|
8d9645 |
+ virHashForEach(dmn->servers, daemonServerHasClients, &ret;;
|
|
|
8d9645 |
+
|
|
|
8d9645 |
+ return ret;
|
|
|
8d9645 |
}
|
|
|
8d9645 |
--
|
|
|
8d9645 |
2.7.2
|
|
|
8d9645 |
|