提交 a018c0b9 编写于 作者: D Daniel P. Berrange

Fix check of virKillProcess return status

The error code for virKillProcess is returned in the errno variable
not the return value. THis mistake caused the logs to be filled with
errors when shutting down QEMU processes

* src/qemu/qemu_process.c: Fix process kill check.
上级 eb2664cb
...@@ -2518,7 +2518,6 @@ cleanup: ...@@ -2518,7 +2518,6 @@ cleanup:
void qemuProcessKill(virDomainObjPtr vm) void qemuProcessKill(virDomainObjPtr vm)
{ {
int i; int i;
int rc;
VIR_DEBUG("vm=%s pid=%d", vm->def->name, vm->pid); VIR_DEBUG("vm=%s pid=%d", vm->def->name, vm->pid);
if (!virDomainObjIsActive(vm)) { if (!virDomainObjIsActive(vm)) {
...@@ -2540,9 +2539,8 @@ void qemuProcessKill(virDomainObjPtr vm) ...@@ -2540,9 +2539,8 @@ void qemuProcessKill(virDomainObjPtr vm)
else else
signum = 0; /* Just check for existence */ signum = 0; /* Just check for existence */
rc = virKillProcess(vm->pid, signum); if (virKillProcess(vm->pid, signum) < 0) {
if (rc < 0) { if (errno != ESRCH) {
if (rc != -ESRCH) {
char ebuf[1024]; char ebuf[1024];
VIR_WARN("Failed to kill process %d %s", VIR_WARN("Failed to kill process %d %s",
vm->pid, virStrerror(errno, ebuf, sizeof ebuf)); vm->pid, virStrerror(errno, ebuf, sizeof ebuf));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册