mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-09-01 00:46:38 +00:00
Merge pull request #6959 from beraldoleal/issues/6757
runtime: sending SIGKILL to qemu
This commit is contained in:
@@ -1122,22 +1122,21 @@ func (q *qemu) StopVM(ctx context.Context, waitOnly bool) (err error) {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pids := q.GetPids()
|
||||||
|
if len(pids) == 0 {
|
||||||
|
return errors.New("cannot determine QEMU PID")
|
||||||
|
}
|
||||||
|
pid := pids[0]
|
||||||
|
|
||||||
if waitOnly {
|
if waitOnly {
|
||||||
pids := q.GetPids()
|
|
||||||
if len(pids) == 0 {
|
|
||||||
return errors.New("cannot determine QEMU PID")
|
|
||||||
}
|
|
||||||
|
|
||||||
pid := pids[0]
|
|
||||||
|
|
||||||
err := utils.WaitLocalProcess(pid, qemuStopSandboxTimeoutSecs, syscall.Signal(0), q.Logger())
|
err := utils.WaitLocalProcess(pid, qemuStopSandboxTimeoutSecs, syscall.Signal(0), q.Logger())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
err := q.qmpMonitorCh.qmp.ExecuteQuit(q.qmpMonitorCh.ctx)
|
err = syscall.Kill(pid, syscall.SIGKILL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
q.Logger().WithError(err).Error("Fail to execute qmp QUIT")
|
q.Logger().WithError(err).Error("Fail to send SIGKILL to qemu")
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user