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