On 8/3/21 5:13 PM, Ján Tomko wrote:
> Add a version of virPidFileForceCleanupPath that takes
> a 'group' bool argument and propagate it all the way
> down to virProcessKillPainfullyDelay.
>
> Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
> ---
> src/libvirt_private.syms | 1 +
> src/qemu/qemu_process.c | 3 ++-
> src/util/virpidfile.c | 8 +++++++-
> src/util/virpidfile.h | 2 ++
> src/util/virprocess.c | 8 ++++----
> src/util/virprocess.h | 3 ++-
> 6 files changed, 18 insertions(+), 7 deletions(-)
>
> diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
> index 6961cdb137..e2e4c9482d 100644
> --- a/src/libvirt_private.syms
> +++ b/src/libvirt_private.syms
> @@ -3038,6 +3038,7 @@ virPidFileConstructPath;
> virPidFileDelete;
> virPidFileDeletePath;
> virPidFileForceCleanupPath;
> +virPidFileForceCleanupPathFull;
> virPidFileRead;
> virPidFileReadIfAlive;
> virPidFileReadPath;
> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
> index 521fda57da..6ef8ebd83e 100644
> --- a/src/qemu/qemu_process.c
> +++ b/src/qemu/qemu_process.c
> @@ -7700,7 +7700,8 @@ qemuProcessKill(virDomainObj *vm, unsigned int flags)
> * to be safe against stalls by the kernel freeing up the resources */
> return virProcessKillPainfullyDelay(vm->pid,
> !!(flags & VIR_QEMU_PROCESS_KILL_FORCE),
> - vm->def->nhostdevs * 2);
> + vm->def->nhostdevs * 2,
> + false);
> }
>
>
> diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c
> index c6389c1869..b75f441008 100644
> --- a/src/util/virpidfile.c
> +++ b/src/util/virpidfile.c
> @@ -514,7 +514,7 @@ virPidFileConstructPath(bool privileged,
> * Returns 0 if the pidfile was successfully cleaned up, -1 otherwise.
> */
> int
> -virPidFileForceCleanupPath(const char *path)
> +virPidFileForceCleanupPathFull(const char *path, bool group)
This 'group' is unused argument.
> {
> pid_t pid = 0;
> int fd = -1;
Also, I don't think anybody will want to backport this patch separately
and NOT the part that's actually interesting (last two hunks from the
next patch).
Michal
