[libvirt] [PATCH v4 3/5] qemuDomainGetJobStatsInternal: Support migration events
When QEMU supports migration events the qemuDomainJobInfo structure will
no longer be updated with migration statistics. We have to enter a job
and explicitly ask QEMU every time virDomainGetJob{Info,Stats} is
called.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
Notes:
ACKed in version 3
Version 4:
- no change
Version 3:
- moved before "qemu: Update migration state according to MIGRATION
event"
Version 2:
- new patch
src/qemu/qemu_driver.c | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 900740e..229ccde 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -12939,15 +12939,27 @@ qemuConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED,
static int
-qemuDomainGetJobStatsInternal(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
+qemuDomainGetJobStatsInternal(virQEMUDriverPtr driver,
virDomainObjPtr vm,
bool completed,
qemuDomainJobInfoPtr jobInfo)
{
qemuDomainObjPrivatePtr priv = vm->privateData;
qemuDomainJobInfoPtr info;
+ bool fetch = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_EVENT);
int ret = -1;
+ if (completed)
+ fetch = false;
+
+ /* Do not ask QEMU if migration is not even running yet */
+ if (!priv->job.current || !priv->job.current->status.status)
+ fetch = false;
+
+ if (fetch &&
+ qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0)
+ return -1;
+
if (!completed &&
!virDomainObjIsActive(vm)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
@@ -12968,12 +12980,19 @@ qemuDomainGetJobStatsInternal(virQEMUDriverPtr driver
ATTRIBUTE_UNUSED,
*jobInfo = *info;
if (jobInfo->type == VIR_DOMAIN_JOB_BOUNDED ||
- jobInfo->type == VIR_DOMAIN_JOB_UNBOUNDED)
- ret = qemuDomainJobInfoUpdateTime(jobInfo);
- else
+ jobInfo->type == VIR_DOMAIN_JOB_UNBOUNDED) {
+ if (fetch)
+ ret = qemuMigrationFetchJobStatus(driver, vm, QEMU_ASYNC_JOB_NONE,
+ jobInfo);
+ else
+ ret = qemuDomainJobInfoUpdateTime(jobInfo);
+ } else {
ret = 0;
+ }
cleanup:
+ if (fetch)
+ qemuDomainObjEndJob(driver, vm);
return ret;
}
--
2.4.5