[libvirt] [PATCH v6 05/33] 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 e062e4daa8..2bacd5e40a 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4377,7 +4377,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 e3f793d1e5..2ab1319ab9 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8209,7 +8209,7 @@ qemuProcessQMPFree(qemuProcessQMPPtr proc)
if (!proc)
return;
- qemuProcessQMPAbort(proc);
+ qemuProcessQMPStop(proc);
VIR_FREE(proc->binary);
VIR_FREE(proc->monpath);
VIR_FREE(proc->monarg);
@@ -8345,7 +8345,7 @@ qemuProcessQMPRun(qemuProcessQMPPtr proc,
cleanup:
if (!proc->mon)
- qemuProcessQMPAbort(proc);
+ qemuProcessQMPStop(proc);
virObjectUnref(xmlopt);
return ret;
@@ -8357,7 +8357,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 05bcf4f12b..28186a256f 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 /* LIBVIRT_QEMU_PROCESS_H */
--
2.17.1