diff options
author | John Snow <jsnow@redhat.com> | 2018-08-29 21:57:27 -0400 |
---|---|---|
committer | Max Reitz <mreitz@redhat.com> | 2018-08-31 16:28:33 +0200 |
commit | 3d1f8b07a4c241f81949eff507d9f3a8fd73b87b (patch) | |
tree | 7331c18b0a63be6b97cb783320d9cbff485f7f14 /job-qmp.c | |
parent | f67432a2019caf05b57a146bf45c1024a5cb608e (diff) |
jobs: canonize Error object
Jobs presently use both an Error object in the case of the create job,
and char strings in the case of generic errors elsewhere.
Unify the two paths as just j->err, and remove the extra argument from
job_completed. The integer error code for job_completed is kept for now,
to be removed shortly in a separate patch.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20180830015734.19765-3-jsnow@redhat.com
[mreitz: Dropped a superfluous g_strdup()]
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'job-qmp.c')
-rw-r--r-- | job-qmp.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -146,8 +146,9 @@ static JobInfo *job_query_single(Job *job, Error **errp) .status = job->status, .current_progress = job->progress_current, .total_progress = job->progress_total, - .has_error = !!job->error, - .error = g_strdup(job->error), + .has_error = !!job->err, + .error = job->err ? \ + g_strdup(error_get_pretty(job->err)) : NULL, }; return info; |