From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 1 Mar 2019 14:48:53 +0000 (+0100)
Subject: daemon: Register secret driver before storage driver
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c6266ddb0214512200c5043f3196d3ca3e73919d;p=libvirt.git

daemon: Register secret driver before storage driver

The order in which drivers are registered is important because
their stateInitialize and stateAutoStart callback are called in
that order. Well, stateAutoStart is going away and therefore if
there is some dependency between two drivers (e.g. when
initializing storage driver expects secret driver to be available
already), the registration of such drivers must happen in correct
order.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index 54ddfc42a0..61eabe03be 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -312,6 +312,10 @@ static int daemonInitialize(void)
     if (virDriverLoadModule("interface", "interfaceRegister", false) < 0)
         return -1;
 #endif
+#ifdef WITH_SECRETS
+    if (virDriverLoadModule("secret", "secretRegister", false) < 0)
+        return -1;
+#endif
 #ifdef WITH_STORAGE
     if (virDriverLoadModule("storage", "storageRegister", false) < 0)
         return -1;
@@ -320,10 +324,6 @@ static int daemonInitialize(void)
     if (virDriverLoadModule("nodedev", "nodedevRegister", false) < 0)
         return -1;
 #endif
-#ifdef WITH_SECRETS
-    if (virDriverLoadModule("secret", "secretRegister", false) < 0)
-        return -1;
-#endif
 #ifdef WITH_NWFILTER
     if (virDriverLoadModule("nwfilter", "nwfilterRegister", false) < 0)
         return -1;