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 /tests | |
| parent | f67432a2019caf05b57a146bf45c1024a5cb608e (diff) | |
| download | qemu-3d1f8b07a4c241f81949eff507d9f3a8fd73b87b.zip qemu-3d1f8b07a4c241f81949eff507d9f3a8fd73b87b.tar.gz qemu-3d1f8b07a4c241f81949eff507d9f3a8fd73b87b.tar.bz2 | |
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 'tests')
| -rw-r--r-- | tests/test-bdrv-drain.c | 2 | ||||
| -rw-r--r-- | tests/test-blockjob-txn.c | 2 | ||||
| -rw-r--r-- | tests/test-blockjob.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c index 39ee723..6bda445 100644 --- a/tests/test-bdrv-drain.c +++ b/tests/test-bdrv-drain.c @@ -754,7 +754,7 @@ typedef struct TestBlockJob { static void test_job_completed(Job *job, void *opaque) { - job_completed(job, 0, NULL); + job_completed(job, 0); } static int coroutine_fn test_job_run(Job *job, Error **errp) diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c index 3194924..82cedee 100644 --- a/tests/test-blockjob-txn.c +++ b/tests/test-blockjob-txn.c @@ -34,7 +34,7 @@ static void test_block_job_complete(Job *job, void *opaque) rc = -ECANCELED; } - job_completed(job, rc, NULL); + job_completed(job, rc); bdrv_unref(bs); } diff --git a/tests/test-blockjob.c b/tests/test-blockjob.c index b0462bf..408a226 100644 --- a/tests/test-blockjob.c +++ b/tests/test-blockjob.c @@ -167,7 +167,7 @@ static void cancel_job_completed(Job *job, void *opaque) { CancelJob *s = opaque; s->completed = true; - job_completed(job, 0, NULL); + job_completed(job, 0); } static void cancel_job_complete(Job *job, Error **errp) |