[libvirt] [PATCH] interface: fix driver name in state directory path

Daniel P. Berrangé posted 1 patch 4 years, 9 months ago
Test syntax-check passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20190715120016.6289-1-berrange@redhat.com
src/interface/interface_backend_netcf.c | 4 ++--
src/interface/interface_backend_udev.c  | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
[libvirt] [PATCH] interface: fix driver name in state directory path
Posted by Daniel P. Berrangé 4 years, 9 months ago
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.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 src/interface/interface_backend_netcf.c | 4 ++--
 src/interface/interface_backend_udev.c  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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;
     }
 
-- 
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] interface: fix driver name in state directory path
Posted by Erik Skultety 4 years, 9 months ago
On Mon, Jul 15, 2019 at 01:00:16PM +0100, Daniel P. Berrangé wrote:
> 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.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
Reviewed-by: Erik Skultety <eskultet@redhat.com>

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list