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 a17d7200c2533ee66dcfc57b92d3250536782b3e..e2bfc420bb2170b6db9f1bb7a368c2045378483c 100644 (file)
--- 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 4d38030179f3ca2c58a9f5adf2778e213faaa545..9f3783ab707db9d17deec73cc6ece47cc5b9f313 100644 (file)
--- 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);
 }