[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 08/21] tests/test-blockjob-txn: utilize job_exit shi
From: |
John Snow |
Subject: |
[Qemu-block] [PATCH 08/21] tests/test-blockjob-txn: utilize job_exit shim |
Date: |
Tue, 7 Aug 2018 00:33:36 -0400 |
This is safe to do because job_complete which will get called
implicitly already handles resetting the job error code if the job
gets cancelled, so this stanza was wasted effort.
Signed-off-by: John Snow <address@hidden>
---
tests/test-blockjob-txn.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c
index fce836639a..307726d089 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);
}
@@ -55,8 +49,7 @@ static void coroutine_fn test_block_job_run(void *opaque)
}
}
- job_defer_to_main_loop(&job->job, test_block_job_complete,
- (void *)(intptr_t)s->rc);
+ s->common.job.ret = s->rc;
}
typedef struct {
@@ -81,6 +74,7 @@ static const BlockJobDriver test_block_job_driver = {
.user_resume = block_job_user_resume,
.drain = block_job_drain,
.start = test_block_job_run,
+ .exit = test_block_job_exit,
},
};
--
2.14.4
- [Qemu-block] [PATCH 03/21] block/backup: utilize job_exit shim, (continued)
- [Qemu-block] [PATCH 13/21] block/commit: add block job creation flags, John Snow, 2018/08/07
- [Qemu-block] [PATCH 17/21] block/mirror: conservative mirror_exit refactor, John Snow, 2018/08/07
- [Qemu-block] [PATCH 07/21] block/create: utilize job_exit shim, John Snow, 2018/08/07
- [Qemu-block] [PATCH 08/21] tests/test-blockjob-txn: utilize job_exit shim,
John Snow <=
- [Qemu-block] [PATCH 01/21] jobs: canonize Error object, John Snow, 2018/08/07
[Qemu-block] [PATCH 02/21] jobs: add exit shim, John Snow, 2018/08/07