Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2020-03-24-tag0' into...

[thirdparty/qemu.git] / job-qmp.c

diff --git a/job-qmp.c b/job-qmp.c
index a969b2bbf00b47b134cdd41e3660b64d649babe7..fecc939ebd951aa3bb863400b71c3bd27d874c84 100644 (file)
--- a/job-qmp.c
+++ b/job-qmp.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "qemu/job.h"
 #include "qapi/qapi-commands-job.h"
 #include "qapi/error.h"
@@ -144,8 +143,8 @@ static JobInfo *job_query_single(Job *job, Error **errp)
         .id                 = g_strdup(job->id),
         .type               = job_type(job),
         .status             = job->status,
-        .current_progress   = job->progress_current,
-        .total_progress     = job->progress_total,
+        .current_progress   = job->progress.current,
+        .total_progress     = job->progress.total,
         .has_error          = !!job->err,
         .error              = job->err ? \
                               g_strdup(error_get_pretty(job->err)) : NULL,