From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 4 Dec 2020 15:08:02 +0000 (+0100)
Subject: qemuDomainGetBlockJobInfo: Work stats for unfinished pre-blockdev blockjob
X-Git-Tag: v7.0.0-rc1~290
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5e8715a8b4;p=thirdparty%2Flibvirt.git

qemuDomainGetBlockJobInfo: Work stats for unfinished pre-blockdev blockjob

If the job has finished, but we didn't yet process the completion fake
that it's still incomplete so that apps which decided to poll
qemuDomainGetBlockJobInfo rather than use events can be sure that the
XML update was completed.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e2fde6c76f..3051d2c7ca 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -14642,6 +14642,15 @@ qemuBlockJobInfoTranslate(qemuMonitorBlockJobInfoPtr rawInfo,
                           virDomainDiskDefPtr disk,
                           bool reportBytes)
 {
+    /* If the job data is no longer present this means that the job already
+     * disappeared in qemu (pre-blockdev) but libvirt didn't process the
+     * finishing yet. Fake a incomplete job. */
+    if (!rawInfo) {
+        info->cur = 0;
+        info->end = 1;
+        return 0;
+    }
+
     info->cur = rawInfo->cur;
     info->end = rawInfo->end;
 
@@ -14727,10 +14736,7 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom,
     if (qemuDomainObjExitMonitor(driver, vm) < 0 || !blockjobstats)
         goto endjob;
 
-    if (!(rawInfo = g_hash_table_lookup(blockjobstats, job->name))) {
-        ret = 0;
-        goto endjob;
-    }
+    rawInfo = g_hash_table_lookup(blockjobstats, job->name);
 
     if (qemuBlockJobInfoTranslate(rawInfo, info, disk,
                                   flags & VIR_DOMAIN_BLOCK_JOB_INFO_BANDWIDTH_BYTES) < 0)