External/libvirt
1
0
Fork 0
Code

Pass virDomainObjPtr to qemuDomainAgentAvailable

Browse Source 
Not just the DomainObj's private data.

(cherry picked from commit fbb94044eabf1853af605314da96b533f7c3d44e)
This commit is contained in:
Ján Tomko 2015-02-27 14:06:47 +01:00 committed by Cole Robinson
parent 99680243f6
commit 4f712a2e95
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_domain.c
View File

@ -2799,9 +2799,11 @@ qemuDomainDefCheckABIStability(virQEMUDriverPtr driver,
} }
bool bool
qemuDomainAgentAvailable(qemuDomainObjPrivatePtr priv, qemuDomainAgentAvailable(virDomainObjPtr vm,
bool reportError) bool reportError)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData;
if (priv->agentError) { if (priv->agentError) {
if (reportError) { if (reportError) {
virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s",

2
src/qemu/qemu_domain.h
View File

@ -395,7 +395,7 @@ bool qemuDomainDefCheckABIStability(virQEMUDriverPtr driver,
virDomainDefPtr src, virDomainDefPtr src,
virDomainDefPtr dst); virDomainDefPtr dst);
bool qemuDomainAgentAvailable(qemuDomainObjPrivatePtr priv, bool qemuDomainAgentAvailable(virDomainObjPtr vm,
bool reportError); bool reportError);
int qemuDomainJobInfoUpdateTime(qemuDomainJobInfoPtr jobInfo) int qemuDomainJobInfoUpdateTime(qemuDomainJobInfoPtr jobInfo)

24
src/qemu/qemu_driver.c
View File

@ -1992,7 +1992,7 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags)
goto cleanup; goto cleanup;
agentForced = agentRequested && !acpiRequested; agentForced = agentRequested && !acpiRequested;
if (!qemuDomainAgentAvailable(priv, agentForced)) { if (!qemuDomainAgentAvailable(vm, agentForced)) {
if (agentForced) if (agentForced)
goto endjob; goto endjob;
useAgent = false; useAgent = false;
@ -2107,7 +2107,7 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags)
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup; goto cleanup;
if (useAgent && !qemuDomainAgentAvailable(priv, true)) if (useAgent && !qemuDomainAgentAvailable(vm, true))
goto endjob; goto endjob;
if (!virDomainObjIsActive(vm)) { if (!virDomainObjIsActive(vm)) {
@ -4815,7 +4815,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
goto endjob; goto endjob;
} }
if (!qemuDomainAgentAvailable(priv, true)) if (!qemuDomainAgentAvailable(vm, true))
goto endjob; goto endjob;
if (nvcpus > vm->def->vcpus) { if (nvcpus > vm->def->vcpus) {
@ -5539,7 +5539,7 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0)
goto cleanup; goto cleanup;
if (!qemuDomainAgentAvailable(priv, true)) if (!qemuDomainAgentAvailable(vm, true))
goto endjob; goto endjob;
if (!virDomainObjIsActive(vm)) { if (!virDomainObjIsActive(vm)) {
@ -12941,7 +12941,7 @@ qemuDomainSnapshotFSFreeze(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
int frozen; int frozen;
if (!qemuDomainAgentAvailable(priv, true)) if (!qemuDomainAgentAvailable(vm, true))
return -1; return -1;
qemuDomainObjEnterAgent(vm); qemuDomainObjEnterAgent(vm);
@ -12961,7 +12961,7 @@ qemuDomainSnapshotFSThaw(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
int thawed; int thawed;
virErrorPtr err = NULL; virErrorPtr err = NULL;
if (!qemuDomainAgentAvailable(priv, report)) if (!qemuDomainAgentAvailable(vm, report))
return -1; return -1;
qemuDomainObjEnterAgent(vm); qemuDomainObjEnterAgent(vm);
@ -17663,7 +17663,7 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom,
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup; goto cleanup;
if (!qemuDomainAgentAvailable(priv, true)) if (!qemuDomainAgentAvailable(vm, true))
goto endjob; goto endjob;
if (!virDomainObjIsActive(vm)) { if (!virDomainObjIsActive(vm)) {
@ -17783,7 +17783,7 @@ qemuDomainQemuAgentCommand(virDomainPtr domain,
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup; goto cleanup;
if (!qemuDomainAgentAvailable(priv, true)) if (!qemuDomainAgentAvailable(vm, true))
goto endjob; goto endjob;
if (!virDomainObjIsActive(vm)) { if (!virDomainObjIsActive(vm)) {
@ -17892,7 +17892,7 @@ qemuDomainFSTrim(virDomainPtr dom,
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup; goto cleanup;
if (!qemuDomainAgentAvailable(priv, true)) if (!qemuDomainAgentAvailable(vm, true))
goto endjob; goto endjob;
if (!virDomainObjIsActive(vm)) { if (!virDomainObjIsActive(vm)) {
@ -18076,7 +18076,7 @@ qemuDomainGetTime(virDomainPtr dom,
goto endjob; goto endjob;
} }
if (!qemuDomainAgentAvailable(priv, true)) if (!qemuDomainAgentAvailable(vm, true))
goto endjob; goto endjob;
qemuDomainObjEnterAgent(vm); qemuDomainObjEnterAgent(vm);
@ -18135,7 +18135,7 @@ qemuDomainSetTime(virDomainPtr dom,
goto endjob; goto endjob;
} }
if (!qemuDomainAgentAvailable(priv, true)) if (!qemuDomainAgentAvailable(vm, true))
goto endjob; goto endjob;
qemuDomainObjEnterAgent(vm); qemuDomainObjEnterAgent(vm);
@ -19115,7 +19115,7 @@ qemuDomainGetFSInfo(virDomainPtr dom,
goto endjob; goto endjob;
} }
if (!qemuDomainAgentAvailable(priv, true)) if (!qemuDomainAgentAvailable(vm, true))
goto endjob; goto endjob;
qemuDomainObjEnterAgent(vm); qemuDomainObjEnterAgent(vm);