External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-23 04:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_process: Use consistent name for stop process function

Browse Source 
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>
This commit is contained in:
Chris Venteicher 2019-01-12 18:50:04 -06:00 committed by Jiri Denemark
parent 3dcdd18b6b
commit 468841eabd
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_capabilities.c
View File

@ -4379,7 +4379,7 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps,
goto cleanup; goto cleanup;
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) {
qemuProcessQMPAbort(proc); qemuProcessQMPStop(proc);
if ((rc = qemuProcessQMPRun(proc, true)) != 0) { if ((rc = qemuProcessQMPRun(proc, true)) != 0) {
if (rc == 1) if (rc == 1)
ret = 0; ret = 0;

6
src/qemu/qemu_process.c
View File

@ -8330,7 +8330,7 @@ qemuProcessQMPFree(qemuProcessQMPPtr proc)
if (!proc) if (!proc)
return; return;
qemuProcessQMPAbort(proc); qemuProcessQMPStop(proc);
VIR_FREE(proc->binary); VIR_FREE(proc->binary);
VIR_FREE(proc->monpath); VIR_FREE(proc->monpath);
VIR_FREE(proc->monarg); VIR_FREE(proc->monarg);
@ -8474,7 +8474,7 @@ qemuProcessQMPRun(qemuProcessQMPPtr proc,
cleanup: cleanup:
if (!proc->mon) if (!proc->mon)
qemuProcessQMPAbort(proc); qemuProcessQMPStop(proc);
virObjectUnref(xmlopt); virObjectUnref(xmlopt);
return ret; return ret;
@ -8486,7 +8486,7 @@ qemuProcessQMPRun(qemuProcessQMPPtr proc,
void void
qemuProcessQMPAbort(qemuProcessQMPPtr proc) qemuProcessQMPStop(qemuProcessQMPPtr proc)
{ {
if (proc->mon) if (proc->mon)
virObjectUnlock(proc->mon); virObjectUnlock(proc->mon);

2
src/qemu/qemu_process.h
View File

@ -242,6 +242,6 @@ void qemuProcessQMPFree(qemuProcessQMPPtr proc);
int qemuProcessQMPRun(qemuProcessQMPPtr proc, int qemuProcessQMPRun(qemuProcessQMPPtr proc,
bool forceTCG); bool forceTCG);
void qemuProcessQMPAbort(qemuProcessQMPPtr proc); void qemuProcessQMPStop(qemuProcessQMPPtr proc);
#endif /* LIBVIRT_QEMU_PROCESS_H */ #endif /* LIBVIRT_QEMU_PROCESS_H */