mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-14 00:25:17 +00:00
qemu: Switch code to use new agent job APIs
There are two sets of functions here: 1) some functions talk on both monitor and agent monitor, 2) some functions only talk on agent monitor. For functions from set 1) we need to use qemuDomainObjBeginJobWithAgent() and for functions from set 2) we need to use qemuDomainObjBeginAgentJob() only. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
parent
cb2bc7a492
commit
2260f18cd7
@ -1954,6 +1954,7 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags)
|
||||
bool useAgent = false, agentRequested, acpiRequested;
|
||||
bool isReboot = false;
|
||||
bool agentForced;
|
||||
qemuDomainAgentJob agentJob = QEMU_AGENT_JOB_NONE;
|
||||
int agentFlag = QEMU_AGENT_SHUTDOWN_POWERDOWN;
|
||||
|
||||
virCheckFlags(VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN |
|
||||
@ -1980,7 +1981,12 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags)
|
||||
if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def, flags) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
|
||||
if (useAgent)
|
||||
agentJob = QEMU_AGENT_JOB_MODIFY;
|
||||
|
||||
if (qemuDomainObjBeginJobWithAgent(driver, vm,
|
||||
QEMU_JOB_MODIFY,
|
||||
agentJob) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) {
|
||||
@ -2026,7 +2032,10 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags)
|
||||
}
|
||||
|
||||
endjob:
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
if (agentJob)
|
||||
qemuDomainObjEndJobWithAgent(driver, vm);
|
||||
else
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
|
||||
cleanup:
|
||||
virDomainObjEndAPI(&vm);
|
||||
@ -2049,6 +2058,7 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags)
|
||||
bool useAgent = false, agentRequested, acpiRequested;
|
||||
bool isReboot = true;
|
||||
bool agentForced;
|
||||
qemuDomainAgentJob agentJob = QEMU_AGENT_JOB_NONE;
|
||||
int agentFlag = QEMU_AGENT_SHUTDOWN_REBOOT;
|
||||
|
||||
virCheckFlags(VIR_DOMAIN_REBOOT_ACPI_POWER_BTN |
|
||||
@ -2075,7 +2085,12 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags)
|
||||
if (virDomainRebootEnsureACL(dom->conn, vm->def, flags) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
|
||||
if (useAgent)
|
||||
agentJob = QEMU_AGENT_JOB_MODIFY;
|
||||
|
||||
if (qemuDomainObjBeginJobWithAgent(driver, vm,
|
||||
QEMU_JOB_MODIFY,
|
||||
agentJob) < 0)
|
||||
goto cleanup;
|
||||
|
||||
agentForced = agentRequested && !acpiRequested;
|
||||
@ -2115,7 +2130,10 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags)
|
||||
}
|
||||
|
||||
endjob:
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
if (agentJob)
|
||||
qemuDomainObjEndJobWithAgent(driver, vm);
|
||||
else
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
|
||||
cleanup:
|
||||
virDomainObjEndAPI(&vm);
|
||||
@ -4949,6 +4967,9 @@ qemuDomainSetVcpusFlags(virDomainPtr dom,
|
||||
virDomainDefPtr def;
|
||||
virDomainDefPtr persistentDef;
|
||||
bool hotpluggable = !!(flags & VIR_DOMAIN_VCPU_HOTPLUGGABLE);
|
||||
bool useAgent = !!(flags & VIR_DOMAIN_VCPU_GUEST);
|
||||
qemuDomainJob job = QEMU_JOB_NONE;
|
||||
qemuDomainAgentJob agentJob = QEMU_AGENT_JOB_NONE;
|
||||
int ret = -1;
|
||||
|
||||
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
|
||||
@ -4963,13 +4984,18 @@ qemuDomainSetVcpusFlags(virDomainPtr dom,
|
||||
if (virDomainSetVcpusFlagsEnsureACL(dom->conn, vm->def, flags) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
|
||||
if (useAgent)
|
||||
agentJob = QEMU_AGENT_JOB_MODIFY;
|
||||
else
|
||||
job = QEMU_JOB_MODIFY;
|
||||
|
||||
if (qemuDomainObjBeginJobWithAgent(driver, vm, job, agentJob) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0)
|
||||
goto endjob;
|
||||
|
||||
if (flags & VIR_DOMAIN_VCPU_GUEST)
|
||||
if (useAgent)
|
||||
ret = qemuDomainSetVcpusAgent(vm, nvcpus);
|
||||
else if (flags & VIR_DOMAIN_VCPU_MAXIMUM)
|
||||
ret = qemuDomainSetVcpusMax(driver, def, persistentDef, nvcpus);
|
||||
@ -4978,7 +5004,10 @@ qemuDomainSetVcpusFlags(virDomainPtr dom,
|
||||
nvcpus, hotpluggable);
|
||||
|
||||
endjob:
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
if (agentJob)
|
||||
qemuDomainObjEndAgentJob(vm);
|
||||
else
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
|
||||
cleanup:
|
||||
virDomainObjEndAPI(&vm);
|
||||
@ -5429,7 +5458,7 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
|
||||
goto cleanup;
|
||||
|
||||
if (flags & VIR_DOMAIN_VCPU_GUEST) {
|
||||
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0)
|
||||
if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_QUERY) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (!virDomainObjIsActive(vm)) {
|
||||
@ -5447,7 +5476,7 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
|
||||
qemuDomainObjExitAgent(vm, agent);
|
||||
|
||||
endjob:
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
qemuDomainObjEndAgentJob(vm);
|
||||
|
||||
if (ncpuinfo < 0)
|
||||
goto cleanup;
|
||||
@ -18971,7 +19000,7 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom,
|
||||
if (virDomainPMSuspendForDurationEnsureACL(dom->conn, vm->def) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
|
||||
if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_MODIFY) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (virDomainObjCheckActive(vm) < 0)
|
||||
@ -19002,7 +19031,7 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom,
|
||||
qemuDomainObjExitAgent(vm, agent);
|
||||
|
||||
endjob:
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
qemuDomainObjEndAgentJob(vm);
|
||||
|
||||
cleanup:
|
||||
virDomainObjEndAPI(&vm);
|
||||
@ -19087,7 +19116,7 @@ qemuDomainQemuAgentCommand(virDomainPtr domain,
|
||||
if (virDomainQemuAgentCommandEnsureACL(domain->conn, vm->def) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
|
||||
if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_MODIFY) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (virDomainObjCheckActive(vm) < 0)
|
||||
@ -19105,7 +19134,7 @@ qemuDomainQemuAgentCommand(virDomainPtr domain,
|
||||
VIR_FREE(result);
|
||||
|
||||
endjob:
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
qemuDomainObjEndAgentJob(vm);
|
||||
|
||||
cleanup:
|
||||
virDomainObjEndAPI(&vm);
|
||||
@ -19187,7 +19216,7 @@ qemuDomainFSTrim(virDomainPtr dom,
|
||||
if (virDomainFSTrimEnsureACL(dom->conn, vm->def) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
|
||||
if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_MODIFY) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (!qemuDomainAgentAvailable(vm, true))
|
||||
@ -19201,7 +19230,7 @@ qemuDomainFSTrim(virDomainPtr dom,
|
||||
qemuDomainObjExitAgent(vm, agent);
|
||||
|
||||
endjob:
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
qemuDomainObjEndAgentJob(vm);
|
||||
|
||||
cleanup:
|
||||
virDomainObjEndAPI(&vm);
|
||||
@ -19369,7 +19398,7 @@ qemuDomainGetTime(virDomainPtr dom,
|
||||
if (virDomainGetTimeEnsureACL(dom->conn, vm->def) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0)
|
||||
if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_QUERY) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (virDomainObjCheckActive(vm) < 0)
|
||||
@ -19388,7 +19417,7 @@ qemuDomainGetTime(virDomainPtr dom,
|
||||
ret = 0;
|
||||
|
||||
endjob:
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
qemuDomainObjEndAgentJob(vm);
|
||||
|
||||
cleanup:
|
||||
virDomainObjEndAPI(&vm);
|
||||
@ -19419,7 +19448,9 @@ qemuDomainSetTime(virDomainPtr dom,
|
||||
|
||||
priv = vm->privateData;
|
||||
|
||||
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
|
||||
if (qemuDomainObjBeginJobWithAgent(driver, vm,
|
||||
QEMU_JOB_MODIFY,
|
||||
QEMU_AGENT_JOB_MODIFY) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (virDomainObjCheckActive(vm) < 0)
|
||||
@ -19464,7 +19495,7 @@ qemuDomainSetTime(virDomainPtr dom,
|
||||
ret = 0;
|
||||
|
||||
endjob:
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
qemuDomainObjEndJobWithAgent(driver, vm);
|
||||
|
||||
cleanup:
|
||||
virDomainObjEndAPI(&vm);
|
||||
@ -19490,7 +19521,7 @@ qemuDomainFSFreeze(virDomainPtr dom,
|
||||
if (virDomainFSFreezeEnsureACL(dom->conn, vm->def) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
|
||||
if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_MODIFY) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (virDomainObjCheckActive(vm) < 0)
|
||||
@ -19499,7 +19530,7 @@ qemuDomainFSFreeze(virDomainPtr dom,
|
||||
ret = qemuDomainSnapshotFSFreeze(driver, vm, mountpoints, nmountpoints);
|
||||
|
||||
endjob:
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
qemuDomainObjEndAgentJob(vm);
|
||||
|
||||
cleanup:
|
||||
virDomainObjEndAPI(&vm);
|
||||
@ -19531,7 +19562,7 @@ qemuDomainFSThaw(virDomainPtr dom,
|
||||
if (virDomainFSThawEnsureACL(dom->conn, vm->def) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
|
||||
if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_MODIFY) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (virDomainObjCheckActive(vm) < 0)
|
||||
@ -19540,7 +19571,7 @@ qemuDomainFSThaw(virDomainPtr dom,
|
||||
ret = qemuDomainSnapshotFSThaw(driver, vm, true);
|
||||
|
||||
endjob:
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
qemuDomainObjEndAgentJob(vm);
|
||||
|
||||
cleanup:
|
||||
virDomainObjEndAPI(&vm);
|
||||
@ -20564,7 +20595,7 @@ qemuDomainGetFSInfo(virDomainPtr dom,
|
||||
if (virDomainGetFSInfoEnsureACL(dom->conn, vm->def) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0)
|
||||
if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_QUERY) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (virDomainObjCheckActive(vm) < 0)
|
||||
@ -20584,7 +20615,7 @@ qemuDomainGetFSInfo(virDomainPtr dom,
|
||||
qemuDomainObjExitAgent(vm, agent);
|
||||
|
||||
endjob:
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
qemuDomainObjEndAgentJob(vm);
|
||||
|
||||
cleanup:
|
||||
virDomainObjEndAPI(&vm);
|
||||
@ -20621,7 +20652,7 @@ qemuDomainInterfaceAddresses(virDomainPtr dom,
|
||||
break;
|
||||
|
||||
case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT:
|
||||
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0)
|
||||
if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_QUERY) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (!qemuDomainAgentAvailable(vm, true))
|
||||
@ -20632,7 +20663,7 @@ qemuDomainInterfaceAddresses(virDomainPtr dom,
|
||||
qemuDomainObjExitAgent(vm, agent);
|
||||
|
||||
endjob:
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
qemuDomainObjEndAgentJob(vm);
|
||||
|
||||
break;
|
||||
|
||||
@ -20833,7 +20864,7 @@ qemuDomainSetUserPassword(virDomainPtr dom,
|
||||
if (virDomainSetUserPasswordEnsureACL(dom->conn, vm->def) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
|
||||
if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_MODIFY) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (virDomainObjCheckActive(vm) < 0)
|
||||
@ -20853,7 +20884,7 @@ qemuDomainSetUserPassword(virDomainPtr dom,
|
||||
ret = 0;
|
||||
|
||||
endjob:
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
qemuDomainObjEndAgentJob(vm);
|
||||
|
||||
cleanup:
|
||||
virDomainObjEndAPI(&vm);
|
||||
@ -21094,7 +21125,7 @@ qemuDomainGetGuestVcpus(virDomainPtr dom,
|
||||
if (virDomainGetGuestVcpusEnsureACL(dom->conn, vm->def) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
|
||||
if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_QUERY) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (!qemuDomainAgentAvailable(vm, true))
|
||||
@ -21113,7 +21144,7 @@ qemuDomainGetGuestVcpus(virDomainPtr dom,
|
||||
ret = 0;
|
||||
|
||||
endjob:
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
qemuDomainObjEndAgentJob(vm);
|
||||
|
||||
cleanup:
|
||||
VIR_FREE(info);
|
||||
@ -21153,7 +21184,7 @@ qemuDomainSetGuestVcpus(virDomainPtr dom,
|
||||
if (virDomainSetGuestVcpusEnsureACL(dom->conn, vm->def) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
|
||||
if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_MODIFY) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (!qemuDomainAgentAvailable(vm, true))
|
||||
@ -21199,7 +21230,7 @@ qemuDomainSetGuestVcpus(virDomainPtr dom,
|
||||
qemuDomainObjExitAgent(vm, agent);
|
||||
|
||||
endjob:
|
||||
qemuDomainObjEndJob(driver, vm);
|
||||
qemuDomainObjEndAgentJob(vm);
|
||||
|
||||
cleanup:
|
||||
VIR_FREE(info);
|
||||
|
Loading…
x
Reference in New Issue
Block a user