From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 25 Nov 2019 20:28:14 +0000 (+0100)
Subject: qemu: monitor: Finish implementation of infrastructure for 'query-jobs'
X-Git-Tag: v5.10.0-rc2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01270a9a5fb0670b8d058aa4dea0db5c268642d3;p=thirdparty%2Flibvirt.git

qemu: monitor: Finish implementation of infrastructure for 'query-jobs'

Commit ed56851f1bc6f5 didn't wire up fetching of the statistics for the
job which are reported by 'query-jobs'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index a17d7200c2..e2bfc420bb 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -154,8 +154,8 @@ struct _qemuMonitorJobInfo {
     qemuMonitorJobType type;
     qemuMonitorJobStatus status;
     char *error;
-    long long progressCurrent;
-    long long progressTotal;
+    unsigned long long progressCurrent;
+    unsigned long long progressTotal;
 };
 
 
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 4d38030179..9f3783ab70 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -9221,6 +9221,12 @@ qemuMonitorJSONGetJobInfoOne(virJSONValuePtr data)
     job->id = g_strdup(id);
     job->error = g_strdup(errmsg);
 
+    /* failure to fetch progress stats is not fatal */
+    ignore_value(virJSONValueObjectGetNumberUlong(data, "current-progress",
+                                                  &job->progressCurrent));
+    ignore_value(virJSONValueObjectGetNumberUlong(data, "total-progress",
+                                                  &job->progressTotal));
+
     return g_steal_pointer(&job);
 }