On 2018-08-17 21:04, John Snow wrote: > 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 > for use by pre-emptive cancellation. > > Signed-off-by: John Snow <js...@redhat.com> > --- > block/backup.c | 2 +- > block/commit.c | 2 +- > block/create.c | 5 ++--- > block/mirror.c | 2 +- > block/stream.c | 2 +- > include/qemu/job.h | 10 ++++------ > job-qmp.c | 5 +++-- > job.c | 19 ++++++------------- > tests/test-bdrv-drain.c | 2 +- > tests/test-blockjob-txn.c | 2 +- > tests/test-blockjob.c | 2 +- > 11 files changed, 22 insertions(+), 31 deletions(-)
(Accidentally deleted this part from my first reply) > diff --git a/job.c b/job.c > index 898260b2b3..c9de1af556 100644 > --- a/job.c > +++ b/job.c [...] > @@ -535,7 +535,6 @@ void job_drain(Job *job) > } > } > > - > /** > * All jobs must allow a pause point before entering their job proper. This > * ensures that jobs can be paused prior to being started, then resumed > later. If anything, you should remove one empty line after this function. ;-) Max
signature.asc
Description: OpenPGP digital signature