util: remove waitForLock from virPidFileAcquire

The parameter was added for consistency with virPidFileAcquirePath.
However, all callers of virPidFileAcquire pass false.

Remove the argument.

Partially-reverts: 2250a2b5d21c3b3529727f38a99cba22f84024f7
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index d100adeb8f6b728ddc50f043a9c9a3af0d4947a7..e7d9c2adf3be8980f932f2716d643e7b4d877ba0 100644 (file)
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -1247,7 +1247,7 @@ bhyveStateInitialize(bool privileged,
     }
 
     if ((bhyve_driver->lockFD =
-         virPidFileAcquire(BHYVE_STATE_DIR, "driver", false, getpid())) < 0)
+         virPidFileAcquire(BHYVE_STATE_DIR, "driver", getpid())) < 0)
         goto cleanup;
 
     if (virDomainObjListLoadAllConfigs(bhyve_driver->domains,

diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c
index 5964720e0fac92b636c7efe207a86712c5ffd3db..7bd3e7e1e225fb59aae7e79add4cdceba12d076e 100644 (file)
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -123,7 +123,7 @@ netcfStateInitialize(bool privileged,
     }
 
     if ((driver->lockFD =
-         virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0)
+         virPidFileAcquire(driver->stateDir, "driver", getpid())) < 0)
         goto error;
 
     /* open netcf */

diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
index 54b43fb99981c40dca88f97efc967ce46ae78eb8..cba14f91f825edbc2098a98e65159e967c875448 100644 (file)
--- a/src/interface/interface_backend_udev.c
+++ b/src/interface/interface_backend_udev.c
@@ -1136,7 +1136,7 @@ udevStateInitialize(bool privileged,
     }
 
     if ((driver->lockFD =
-         virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0)
+         virPidFileAcquire(driver->stateDir, "driver", getpid())) < 0)
         goto cleanup;
 
     driver->udev = udev_new();

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index c8bcde2612510cb133829be0f0148155035942c6..04e74086e6c8bf9cbbde683a4e07827cdd0d2908 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -751,7 +751,7 @@ libxlStateInitialize(bool privileged,
     }
 
     if ((libxl_driver->lockFD =
-         virPidFileAcquire(cfg->stateDir, "driver", false, getpid())) < 0)
+         virPidFileAcquire(cfg->stateDir, "driver", getpid())) < 0)
         goto error;
 
     if (!(libxl_driver->lockManager =

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 0f7687a221c56a996769f885e195f55f3837dc7b..b1d53659d71f7ae0bd11c1c1f486ca3bcdf0dfcd 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -1505,7 +1505,7 @@ static int lxcStateInitialize(bool privileged,
     }
 
     if ((lxc_driver->lockFD =
-         virPidFileAcquire(cfg->stateDir, "driver", false, getpid())) < 0)
+         virPidFileAcquire(cfg->stateDir, "driver", getpid())) < 0)
         goto cleanup;
 
     /* Get all the running persistent or transient configs first */

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index a5973e26cd8096045692b55f0475c9ff7c6007b2..3fa56bfc0918a32e691339987998fc5a3c425666 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -608,8 +608,7 @@ networkStateInitialize(bool privileged,
         goto error;
 
     if ((network_driver->lockFD =
-         virPidFileAcquire(cfg->stateDir, "driver",
-                           false, getpid())) < 0)
+         virPidFileAcquire(cfg->stateDir, "driver", getpid())) < 0)
         goto error;
 
     /* if this fails now, it will be retried later with networkDnsmasqCapsRefresh() */

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 2454cab8f8bb732dfa19c95506ec901e6ef07749..5782aa43c89e8fc3ff830ffed4d1315be9c89cb7 100644 (file)
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -2278,7 +2278,7 @@ nodeStateInitialize(bool privileged,
     }
 
     if ((driver->lockFD =
-         virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0)
+         virPidFileAcquire(driver->stateDir, "driver", getpid())) < 0)
         goto cleanup;
 
     if (!(driver->devs = virNodeDeviceObjListNew()) ||

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 8e45096eaa847b2b91336814a212490ee04c15cc..3803850e26ce928cc15c5029a0af3a2d3315e192 100644 (file)
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -254,7 +254,7 @@ nwfilterStateInitialize(bool privileged,
     }
 
     if ((driver->lockFD =
-         virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0)
+         virPidFileAcquire(driver->stateDir, "driver", getpid())) < 0)
         goto error;
 
     if (virNWFilterIPAddrMapInit() < 0)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c546e359536e60c8dcbe7273f422f6a246cb583c..fd8136be375e12828c7b7c5675fd5b61522652c2 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -678,7 +678,7 @@ qemuStateInitialize(bool privileged,
     }
 
     if ((qemu_driver->lockFD =
-         virPidFileAcquire(cfg->stateDir, "driver", false, getpid())) < 0)
+         virPidFileAcquire(cfg->stateDir, "driver", getpid())) < 0)
         goto error;
 
     qemu_driver->qemuImgBinary = virFindFileInPath("qemu-img");

diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index c38cd6f6518f20e5d2430db83079d5fd09262929..43d2a0c05a77123ac0bbd0b42fea8f2f483032a3 100644 (file)
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -536,7 +536,7 @@ secretStateInitialize(bool privileged,
     }
 
     if ((driver->lockFD =
-         virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0)
+         virPidFileAcquire(driver->stateDir, "driver", getpid())) < 0)
         goto error;
 
     if (!(driver->secrets = virSecretObjListNew()))

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index d90c1c9ee8b5162caee406a604b59083afbe7e24..308704f1c8adc190c301e54321f0ce8db0554bb2 100644 (file)
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -289,8 +289,7 @@ storageStateInitialize(bool privileged,
     }
 
     if ((driver->lockFD =
-         virPidFileAcquire(driver->stateDir, "driver",
-                           false, getpid())) < 0)
+         virPidFileAcquire(driver->stateDir, "driver", getpid())) < 0)
         goto error;
 
     if (virStoragePoolObjLoadAllState(driver->pools,

diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c
index bfd967c1af45ba5ae551a0f282c81413f0b4f100..5448a8652d45588fafa470be0971c3d079e374f1 100644 (file)
--- a/src/util/virpidfile.c
+++ b/src/util/virpidfile.c
@@ -447,7 +447,6 @@ int virPidFileAcquirePath(const char *path,
 
 int virPidFileAcquire(const char *dir,
                       const char *name,
-                      bool waitForLock,
                       pid_t pid)
 {
     g_autofree char *pidfile = NULL;
@@ -458,7 +457,7 @@ int virPidFileAcquire(const char *dir,
     if (!(pidfile = virPidFileBuildPath(dir, name)))
         return -ENOMEM;
 
-    return virPidFileAcquirePath(pidfile, waitForLock, pid);
+    return virPidFileAcquirePath(pidfile, false, pid);
 }
 
 

diff --git a/src/util/virpidfile.h b/src/util/virpidfile.h
index e84542f298e875b548bc80570cac9c448e1f703f..ff4d31c9fdf9bae03412f82b05ae05f10ec63bd3 100644 (file)
--- a/src/util/virpidfile.h
+++ b/src/util/virpidfile.h
@@ -61,7 +61,6 @@ int virPidFileAcquirePath(const char *path,
                           pid_t pid) G_GNUC_WARN_UNUSED_RESULT;
 int virPidFileAcquire(const char *dir,
                       const char *name,
-                      bool waitForLock,
                       pid_t pid) G_GNUC_WARN_UNUSED_RESULT;
 
 int virPidFileReleasePath(const char *path,

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 327704b375f75d638fb7122e26defe0d9c47339b..4a7b14997faff9b06e9f1b280302bcbe94ddd11f 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -4097,7 +4097,7 @@ vzStateInitialize(bool privileged,
     }
 
     if ((vz_driver_lock_fd =
-         virPidFileAcquire(VZ_STATEDIR, "driver", false, getpid())) < 0)
+         virPidFileAcquire(VZ_STATEDIR, "driver", getpid())) < 0)
         return VIR_DRV_STATE_INIT_ERROR;
 
     if (prlsdkInit() < 0) {