From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 22 Jan 2018 17:42:08 +0000 (+0000)
Subject: rpc: add method for checking if a named server exists
X-Git-Tag: v4.1.0-rc1~251
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e72f3e59333007d652412f77d0f62254a91803ed;p=thirdparty%2Flibvirt.git

rpc: add method for checking if a named server exists

It is not possible to blindly call virNetDaemonGetServer()
because in a post-exec restart scenario, some servers may
not exist and this method will pollute the error logs.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms
index a181c4cf7f..fab6ab9dff 100644
--- a/src/libvirt_remote.syms
+++ b/src/libvirt_remote.syms
@@ -69,6 +69,7 @@ virNetDaemonClose;
 virNetDaemonGetServer;
 virNetDaemonGetServers;
 virNetDaemonHasClients;
+virNetDaemonHasServer;
 virNetDaemonIsPrivileged;
 virNetDaemonNew;
 virNetDaemonNewPostExecRestart;
diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c
index 8c21414897..5d61a255c6 100644
--- a/src/rpc/virnetdaemon.c
+++ b/src/rpc/virnetdaemon.c
@@ -195,6 +195,19 @@ virNetDaemonGetServer(virNetDaemonPtr dmn,
     return srv;
 }
 
+bool
+virNetDaemonHasServer(virNetDaemonPtr dmn,
+                      const char *serverName)
+{
+    void *ent;
+
+    virObjectLock(dmn);
+    ent = virHashLookup(dmn->servers, serverName);
+    virObjectUnlock(dmn);
+
+    return ent != NULL;
+}
+
 
 struct collectData {
     virNetServerPtr **servers;
diff --git a/src/rpc/virnetdaemon.h b/src/rpc/virnetdaemon.h
index 211009c503..72c1df69b4 100644
--- a/src/rpc/virnetdaemon.h
+++ b/src/rpc/virnetdaemon.h
@@ -83,5 +83,7 @@ bool virNetDaemonHasClients(virNetDaemonPtr dmn);
 virNetServerPtr virNetDaemonGetServer(virNetDaemonPtr dmn,
                                       const char *serverName);
 ssize_t virNetDaemonGetServers(virNetDaemonPtr dmn, virNetServerPtr **servers);
+bool virNetDaemonHasServer(virNetDaemonPtr dmn,
+                           const char *serverName);
 
 #endif /* __VIR_NET_DAEMON_H__ */