From: Chris Venteicher <cventeic@redhat.com>
Date: Sun, 13 Jan 2019 00:50:04 +0000 (-0600)
Subject: qemu_process: Use consistent name for stop process function
X-Git-Tag: v5.1.0-rc1~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=468841eabd436fa7e5de7dd09bfc3ca0ceb8221b;p=thirdparty%2Flibvirt.git

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@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index aa6571457e..d187e35a38 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4379,7 +4379,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 8e45dbc0ce..d463a41ca0 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8330,7 +8330,7 @@ qemuProcessQMPFree(qemuProcessQMPPtr proc)
     if (!proc)
         return;
 
-    qemuProcessQMPAbort(proc);
+    qemuProcessQMPStop(proc);
     VIR_FREE(proc->binary);
     VIR_FREE(proc->monpath);
     VIR_FREE(proc->monarg);
@@ -8474,7 +8474,7 @@ qemuProcessQMPRun(qemuProcessQMPPtr proc,
 
  cleanup:
     if (!proc->mon)
-        qemuProcessQMPAbort(proc);
+        qemuProcessQMPStop(proc);
     virObjectUnref(xmlopt);
 
     return ret;
@@ -8486,7 +8486,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 a480d006f9..c59379facb 100644
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -242,6 +242,6 @@ void qemuProcessQMPFree(qemuProcessQMPPtr proc);
 int qemuProcessQMPRun(qemuProcessQMPPtr proc,
                       bool forceTCG);
 
-void qemuProcessQMPAbort(qemuProcessQMPPtr proc);
+void qemuProcessQMPStop(qemuProcessQMPPtr proc);
 
 #endif /* LIBVIRT_QEMU_PROCESS_H */