diff options
author | John Snow | 2018-08-30 03:57:31 +0200 |
---|---|---|
committer | Max Reitz | 2018-08-31 16:28:33 +0200 |
commit | eb23654dbe43b549ea2a9ebff9d8edf544d34a73 (patch) | |
tree | 4801dd246bf808450c131683b57fd50c1f8dbcaf /tests/test-blockjob-txn.c | |
parent | block/mirror: utilize job_exit shim (diff) | |
download | qemu-eb23654dbe43b549ea2a9ebff9d8edf544d34a73.tar.gz qemu-eb23654dbe43b549ea2a9ebff9d8edf544d34a73.tar.xz qemu-eb23654dbe43b549ea2a9ebff9d8edf544d34a73.zip |
jobs: utilize job_exit shim
Utilize the job_exit shim by not calling job_defer_to_main_loop, and
where applicable, converting the deferred callback into the job_exit
callback.
This converts backup, stream, create, and the unit tests all at once.
Most of these jobs do not see any changes to the order in which they
clean up their resources, except the test-blockjob-txn test, which
now puts down its bs before job_completed is called.
This is safe for the same reason the reordering in the mirror job is
safe, because job_completed no longer runs under two locks, making
the unref safe even if it causes a flush.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20180830015734.19765-7-jsnow@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests/test-blockjob-txn.c')
-rw-r--r-- | tests/test-blockjob-txn.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c index 82cedee78b..ef29f35e44 100644 --- a/tests/test-blockjob-txn.c +++ b/tests/test-blockjob-txn.c @@ -24,17 +24,11 @@ typedef struct { int *result; } TestBlockJob; -static void test_block_job_complete(Job *job, void *opaque) +static void test_block_job_exit(Job *job) { BlockJob *bjob = container_of(job, BlockJob, job); BlockDriverState *bs = blk_bs(bjob->blk); - int rc = (intptr_t)opaque; - if (job_is_cancelled(job)) { - rc = -ECANCELED; - } - - job_completed(job, rc); bdrv_unref(bs); } @@ -54,8 +48,6 @@ static int coroutine_fn test_block_job_run(Job *job, Error **errp) } } - job_defer_to_main_loop(job, test_block_job_complete, - (void *)(intptr_t)s->rc); return s->rc; } @@ -81,6 +73,7 @@ static const BlockJobDriver test_block_job_driver = { .user_resume = block_job_user_resume, .drain = block_job_drain, .run = test_block_job_run, + .exit = test_block_job_exit, }, }; |