From 8a9a0815510ef6de1ee34b865a768d0c6fd7b828 Mon Sep 17 00:00:00 2001 Message-Id: <8a9a0815510ef6de1ee34b865a768d0c6fd7b828@dist-git> From: Michal Privoznik Date: Thu, 27 Jun 2019 15:18:14 +0200 Subject: [PATCH] daemon: Register secret driver before storage driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Ján Tomko (cherry picked from commit c6266ddb0214512200c5043f3196d3ca3e73919d) https://bugzilla.redhat.com/show_bug.cgi?id=1685151 Signed-off-by: Michal Privoznik Message-Id: Reviewed-by: Jiri Denemark --- src/remote/remote_daemon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 9f3a5f38ad..4cd6784099 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -314,6 +314,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; @@ -322,10 +326,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; -- 2.22.0