[PATCH] lxc: return -1 if failed to kill lxc process

[Chen Hanxiao <chenhanxiao@xxxxxxxxxxxxxx>]

From: Chen Hanxiao <chenhanxiao@xxxxxxxxxxxxxx>

We missed a return when virProcessKillPainfully
failed to kill lxc process

Signed-off-by: Chen Hanxiao <chenhanxiao@xxxxxxxxxxxxxx>
---
 src/lxc/lxc_process.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index c51c4d5..4e1e3ac 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -711,7 +711,11 @@ int virLXCProcessStop(virLXCDriverPtr driver,
     } else {
         /* If cgroup doesn't exist, just try cleaning up the
          * libvirt_lxc process */
-        virProcessKillPainfully(vm->pid, true);
+        if (virProcessKillPainfully(vm->pid, true) < 0) {
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("Processes %d refused to die"), (int)vm->pid);
+            return -1;
+        }
     }
 
     virLXCProcessCleanup(driver, vm, reason);
-- 
1.8.2.1

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