From: Daniel P. Berrangé <berrange@redhat.com>
Date: Thu, 11 Jul 2019 15:22:03 +0000 (+0100)
Subject: interface: fix driver name in state directory path
X-Git-Tag: v5.6.0-rc1~206
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=848661154898e517cdc0eaa1f0378a9b74ea6d15;p=thirdparty%2Flibvirt.git

interface: fix driver name in state directory path

Typo meant we use 'nodedev' instead of 'interface'. This doesn't hurt
libvirtd because if a process tries to acquire a lock it already holds
it will succeed. It fails when nodedev & interface drivers are in
separate daemons though.

Reviewed-by: Erik Skultety <eskultet@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c
index f575768c4c..0000587cee 100644
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -102,14 +102,14 @@ netcfStateInitialize(bool privileged,
 
     if (privileged) {
         if (virAsprintf(&driver->stateDir,
-                        "%s/run/libvirt/nodedev", LOCALSTATEDIR) < 0)
+                        "%s/run/libvirt/interface", LOCALSTATEDIR) < 0)
             goto error;
     } else {
         VIR_AUTOFREE(char *) rundir = NULL;
 
         if (!(rundir = virGetUserRuntimeDirectory()))
             goto error;
-        if (virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir) < 0)
+        if (virAsprintf(&driver->stateDir, "%s/interface/run", rundir) < 0)
             goto error;
     }
 
diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
index 2feaeb95b7..fea5108dbc 100644
--- a/src/interface/interface_backend_udev.c
+++ b/src/interface/interface_backend_udev.c
@@ -1181,14 +1181,14 @@ udevStateInitialize(bool privileged,
 
     if (privileged) {
         if (virAsprintf(&driver->stateDir,
-                        "%s/run/libvirt/nodedev", LOCALSTATEDIR) < 0)
+                        "%s/run/libvirt/interface", LOCALSTATEDIR) < 0)
             goto cleanup;
     } else {
         VIR_AUTOFREE(char *) rundir = NULL;
 
         if (!(rundir = virGetUserRuntimeDirectory()))
             goto cleanup;
-        if (virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir) < 0)
+        if (virAsprintf(&driver->stateDir, "%s/interface/run", rundir) < 0)
             goto cleanup;
     }