daemon: Get server name from the server itself

Since servers know their name, there is no need to supply such
information twice.  Also defeats inconsistencies.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index beddec1bb85230965ede10d4716874d5cbb767e9..3d38a46ee7d215dfa4ba1d4e608d3eb4acbf69a1 100644 (file)
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -1400,7 +1400,7 @@ int main(int argc, char **argv) {
     }
 
     if (!(dmn = virNetDaemonNew()) ||
-        virNetDaemonAddServer(dmn, "libvirtd", srv) < 0) {
+        virNetDaemonAddServer(dmn, srv) < 0) {
         ret = VIR_DAEMON_ERR_INIT;
         goto cleanup;
     }
@@ -1474,7 +1474,7 @@ int main(int argc, char **argv) {
         goto cleanup;
     }
 
-    if (virNetDaemonAddServer(dmn, "admin", srvAdm) < 0) {
+    if (virNetDaemonAddServer(dmn, srvAdm) < 0) {
         ret = VIR_DAEMON_ERR_INIT;
         goto cleanup;
     }

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index c89b842f0fafc890a56858cb177f62a8eb950878..973e6918c9fe16b04f8b88276df6612e5d95f362 100644 (file)
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -171,7 +171,7 @@ virLockDaemonNew(virLockDaemonConfigPtr config, bool privileged)
         goto error;
 
     if (!(lockd->dmn = virNetDaemonNew()) ||
-        virNetDaemonAddServer(lockd->dmn, "virtlockd", srv) < 0)
+        virNetDaemonAddServer(lockd->dmn, srv) < 0)
         goto error;
 
     if (!(lockd->lockspaces = virHashCreate(VIR_LOCK_DAEMON_NUM_LOCKSPACES,

diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c
index 866e8a85f4fa8f19021576dccec9571a6afbacfe..68f0647638b3f76cc7854a03e61ad0b7e5c9c961 100644 (file)
--- a/src/logging/log_daemon.c
+++ b/src/logging/log_daemon.c
@@ -161,7 +161,7 @@ virLogDaemonNew(virLogDaemonConfigPtr config, bool privileged)
         goto error;
 
     if (!(logd->dmn = virNetDaemonNew()) ||
-        virNetDaemonAddServer(logd->dmn, "virtlogd", logd->srv) < 0)
+        virNetDaemonAddServer(logd->dmn, logd->srv) < 0)
         goto error;
 
     if (!(logd->handler = virLogHandlerNew(privileged,

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 21cf71fa08a59102674e835d473169455bb686aa..b1b55f0e02e1eb171e3a579acd45bcc2191e3607 100644 (file)
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -968,7 +968,7 @@ static int virLXCControllerSetupServer(virLXCControllerPtr ctrl)
         goto error;
 
     if (!(ctrl->daemon = virNetDaemonNew()) ||
-        virNetDaemonAddServer(ctrl->daemon, "LXC", srv) < 0)
+        virNetDaemonAddServer(ctrl->daemon, srv) < 0)
         goto error;
 
     virNetDaemonUpdateServices(ctrl->daemon, true);

diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c
index 7ae06dd380072180c664b4b1f29ac112cb813218..3dc47792a8baaa55732d0d236b32d04259a4eeb6 100644 (file)
--- a/src/rpc/virnetdaemon.c
+++ b/src/rpc/virnetdaemon.c
@@ -158,10 +158,10 @@ virNetDaemonNew(void)
 
 int
 virNetDaemonAddServer(virNetDaemonPtr dmn,
-                      const char *serverName,
                       virNetServerPtr srv)
 {
     int ret = -1;
+    const char *serverName = virNetServerGetName(srv);
 
     virObjectLock(dmn);
 

diff --git a/src/rpc/virnetdaemon.h b/src/rpc/virnetdaemon.h
index 9a3404f544fd67719ab60ceb0b6295b3db59f534..0084dfd6527aa122af2b6f79f273cf1fffabaebc 100644 (file)
--- a/src/rpc/virnetdaemon.h
+++ b/src/rpc/virnetdaemon.h
@@ -38,7 +38,6 @@
 virNetDaemonPtr virNetDaemonNew(void);
 
 int virNetDaemonAddServer(virNetDaemonPtr dmn,
-                          const char *serverName,
                           virNetServerPtr srv);
 
 virNetServerPtr virNetDaemonAddServerPostExec(virNetDaemonPtr dmn,

diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c
index 443a406b77f22983d2119ed1c40a505649a5a0c2..1608923d09d778558665813714d6ac8bfe0ae9e9 100644 (file)
--- a/tests/virnetdaemontest.c
+++ b/tests/virnetdaemontest.c
@@ -164,7 +164,7 @@ static char *testGenerateJSON(const char *server_name)
     if (!(dmn = virNetDaemonNew()))
         goto cleanup;
 
-    if (virNetDaemonAddServer(dmn, server_name, srv) < 0)
+    if (virNetDaemonAddServer(dmn, srv) < 0)
         goto cleanup;
 
     if (!(json = virNetDaemonPreExecRestart(dmn)))