<html><head><style>div {font-size: 12pt; color: #000000; font-family:微软雅黑;}</style></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><div style="color:#000000; font-Size:12pt; font-family:微软雅黑; word-wrap:break-word;x-overflow:hidden;"><div style="color:#000000; font-Size:12pt; font-family:微软雅黑; word-wrap:break-word;x-overflow:hidden;"><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">If the qemu process is shutdown and flag is set to VIR_QEMU_PROCESS_KILL_NOWAIT,</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">a log alarm is generated even if the qemu process is not stopped.</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;"><br></div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">Signed-off-by: dinglimin <dinglimin@cmss.chinamobile.com></div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">---</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">v1:https://www.mail-archive.com/libvir-list@redhat.com/msg232232.html</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">diff to v1:</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">- Add the patch 's description.</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">- Change the code format.</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">---</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;"><br></div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;"> src/qemu/qemu_process.c | 8 +++++---</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;"> 1 file changed, 5 insertions(+), 3 deletions(-)</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;"><br></div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">index cbfdd3bda5..d876e345a0 100644</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">--- a/src/qemu/qemu_process.c</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">+++ b/src/qemu/qemu_process.c</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">@@ -8006,9 +8006,11 @@ qemuProcessKill(virDomainObj *vm, unsigned int flags)</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;"> }</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;"><br></div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;"> if (flags & VIR_QEMU_PROCESS_KILL_NOWAIT) {</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">- virProcessKill(vm->pid,</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">- (flags & VIR_QEMU_PROCESS_KILL_FORCE) ?</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">- SIGKILL : SIGTERM);</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">+ if (virProcessKill(vm->pid,</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">+ (flags & VIR_QEMU_PROCESS_KILL_FORCE) ?</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">+ SIGKILL : SIGTERM);) {</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">+ VIR_DEBUG("Failed to terminate qemu process");</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">+ }</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;"> return 0;</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;"> }</div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;"><br></div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">-- </div><div style="font-size: 16px; font-family: 微软雅黑; word-wrap: break-word;">2.18.4</div></div><div style="color:#000000; font-Size:12pt; font-family:微软雅黑; word-wrap:break-word;x-overflow:hidden;"><br></div></div><style>div{ font-size:12pt; font-family: Microsoft YaHei; color: black;}</style></body></html>