[libvirt] [PATCH v5 05/36] qemu_process: Use consistent name for stop process function
s/qemuProcessQmpAbort/qemuProcessQmpStop/ applied to change function name
used to stop QEMU processes in process code moved from qemu_capabilities.
No functionality change.
The new name, qemuProcessQmpStop, is consistent with the existing
function qemuProcessStop used to stop Domain processes.
Signed-off-by: Chris Venteicher <cventeic(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 2 +-
src/qemu/qemu_process.c | 6 +++---
src/qemu/qemu_process.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 41a0dfa844..d903fbddf8 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4259,7 +4259,7 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps,
goto cleanup;
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) {
- qemuProcessQmpAbort(proc);
+ qemuProcessQmpStop(proc);
if ((rc = qemuProcessQmpRun(proc, true)) != 0) {
if (rc == 1)
ret = 0;
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 5f4853e0c4..8465448a49 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8113,7 +8113,7 @@ qemuProcessQmpFree(qemuProcessQmpPtr proc)
if (!proc)
return;
- qemuProcessQmpAbort(proc);
+ qemuProcessQmpStop(proc);
VIR_FREE(proc->binary);
VIR_FREE(proc->monpath);
VIR_FREE(proc->monarg);
@@ -8249,7 +8249,7 @@ qemuProcessQmpRun(qemuProcessQmpPtr proc,
cleanup:
if (!proc->mon)
- qemuProcessQmpAbort(proc);
+ qemuProcessQmpStop(proc);
virObjectUnref(xmlopt);
return ret;
@@ -8261,7 +8261,7 @@ qemuProcessQmpRun(qemuProcessQmpPtr proc,
void
-qemuProcessQmpAbort(qemuProcessQmpPtr proc)
+qemuProcessQmpStop(qemuProcessQmpPtr proc)
{
if (proc->mon)
virObjectUnlock(proc->mon);
diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index dea5a84e8c..9a72db9a08 100644
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -242,6 +242,6 @@ void qemuProcessQmpFree(qemuProcessQmpPtr proc);
int qemuProcessQmpRun(qemuProcessQmpPtr cmd,
bool forceTCG);
-void qemuProcessQmpAbort(qemuProcessQmpPtr proc);
+void qemuProcessQmpStop(qemuProcessQmpPtr proc);
#endif /* __QEMU_PROCESS_H__ */
--
2.17.1