|
 |
9de337 |
From 1584be12f2ec36b56b014843179b80eb72d99804 Mon Sep 17 00:00:00 2001
|
|
|
9de337 |
Message-Id: <1584be12f2ec36b56b014843179b80eb72d99804@dist-git>
|
|
|
9de337 |
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
|
9de337 |
Date: Thu, 5 Aug 2021 13:49:47 +0200
|
|
|
9de337 |
Subject: [PATCH] qemu: virtiofs: kill the whole process group
|
|
|
9de337 |
MIME-Version: 1.0
|
|
|
9de337 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9de337 |
Content-Transfer-Encoding: 8bit
|
|
|
9de337 |
|
|
|
9de337 |
Send TERM/KILL to virtiofsd and its child processes too
|
|
|
9de337 |
and do not exit until they are all dead.
|
|
|
9de337 |
|
|
|
9de337 |
https://bugzilla.redhat.com/show_bug.cgi?id=1940276
|
|
|
9de337 |
|
|
|
9de337 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
9de337 |
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
9de337 |
Tested-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
|
|
|
9de337 |
(cherry picked from commit ca43a5198a84e592d9e2e844cdb39b24a0c8732b)
|
|
|
9de337 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
9de337 |
Message-Id: <1af2b57ee80f752ac84f23893f229e2d09e5d475.1628164129.git.jtomko@redhat.com>
|
|
|
9de337 |
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
9de337 |
---
|
|
|
9de337 |
src/qemu/qemu_virtiofs.c | 2 +-
|
|
|
9de337 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
9de337 |
|
|
|
9de337 |
diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c
|
|
|
9de337 |
index edaedf0304..15c05479c8 100644
|
|
|
9de337 |
--- a/src/qemu/qemu_virtiofs.c
|
|
|
9de337 |
+++ b/src/qemu/qemu_virtiofs.c
|
|
|
9de337 |
@@ -281,7 +281,7 @@ qemuVirtioFSStop(virQEMUDriver *driver G_GNUC_UNUSED,
|
|
|
9de337 |
if (!(pidfile = qemuVirtioFSCreatePidFilename(vm, fs->info.alias)))
|
|
|
9de337 |
goto cleanup;
|
|
|
9de337 |
|
|
|
9de337 |
- if (virPidFileForceCleanupPath(pidfile) < 0) {
|
|
|
9de337 |
+ if (virPidFileForceCleanupPathFull(pidfile, true) < 0) {
|
|
|
9de337 |
VIR_WARN("Unable to kill virtiofsd process");
|
|
|
9de337 |
} else {
|
|
|
9de337 |
if (QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock)
|
|
|
9de337 |
--
|
|
|
9de337 |
2.32.0
|
|
|
9de337 |
|