[libvirt] [PATCH 2/5] libvirtd: Alter order of virNetDaemonNew

John Ferlan jferlan at redhat.com
Wed Nov 8 02:39:53 UTC 2017


Let's be sure we can get a Daemon object before the server object.
This is a more "orderly" way to do things since the svr object would
be added to the dmn object afterwards.

Signed-off-by: John Ferlan <jferlan at redhat.com>
---
 daemon/libvirtd.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 4fc33ba0d4..73f24915df 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -1297,6 +1297,11 @@ int main(int argc, char **argv) {
         goto cleanup;
     }
 
+    if (!(dmn = virNetDaemonNew())) {
+        ret = VIR_DAEMON_ERR_INIT;
+        goto cleanup;
+    }
+
     if (!(srv = virNetServerNew("libvirtd", 1,
                                 config->min_workers,
                                 config->max_workers,
@@ -1314,8 +1319,7 @@ int main(int argc, char **argv) {
         goto cleanup;
     }
 
-    if (!(dmn = virNetDaemonNew()) ||
-        virNetDaemonAddServer(dmn, srv) < 0) {
+    if (virNetDaemonAddServer(dmn, srv) < 0) {
         ret = VIR_DAEMON_ERR_INIT;
         goto cleanup;
     }
-- 
2.13.6




More information about the libvir-list mailing list