diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-10-07 10:26:35 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-10-07 10:26:35 -0700 |
| commit | 14f12119aa675e9e28207a48b0728a2daa5b88d6 (patch) | |
| tree | 1911412d7a065ff328d0e4975b0333187f5c1d16 /tests/unit | |
| parent | 3c019339830affe7974b738e0c2b71bd28778ef0 (diff) | |
| parent | 2451f72527d8760566a499b7513e17aaceb0f131 (diff) | |
| download | qemu-14f12119aa675e9e28207a48b0728a2daa5b88d6.zip qemu-14f12119aa675e9e28207a48b0728a2daa5b88d6.tar.gz qemu-14f12119aa675e9e28207a48b0728a2daa5b88d6.tar.bz2 | |
Merge remote-tracking branch 'remotes/vsementsov/tags/pull-jobs-2021-10-07-v2' into staging
mirror: Handle errors after READY cancel
v2: add small fix by Stefano, Hanna's series fixed
# gpg: Signature made Thu 07 Oct 2021 08:25:07 AM PDT
# gpg: using RSA key 8B9C26CDB2FD147C880E86A1561F24C1F19F79FB
# gpg: Good signature from "Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8B9C 26CD B2FD 147C 880E 86A1 561F 24C1 F19F 79FB
* remotes/vsementsov/tags/pull-jobs-2021-10-07-v2:
iotests: Add mirror-ready-cancel-error test
mirror: Do not clear .cancelled
mirror: Stop active mirroring after force-cancel
mirror: Check job_is_cancelled() earlier
mirror: Use job_is_cancelled()
job: Add job_cancel_requested()
job: Do not soft-cancel after a job is done
jobs: Give Job.force_cancel more meaning
job: @force parameter for job_cancel_sync()
job: Force-cancel jobs in a failed transaction
mirror: Drop s->synced
mirror: Keep s->synced on error
job: Context changes in job_completed_txn_abort()
block/aio_task: assert `max_busy_tasks` is greater than 0
block/backup: avoid integer overflow of `max-workers`
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'tests/unit')
| -rw-r--r-- | tests/unit/test-blockjob.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unit/test-blockjob.c b/tests/unit/test-blockjob.c index dcacfa6..4c9e1bf 100644 --- a/tests/unit/test-blockjob.c +++ b/tests/unit/test-blockjob.c @@ -230,7 +230,7 @@ static void cancel_common(CancelJob *s) ctx = job->job.aio_context; aio_context_acquire(ctx); - job_cancel_sync(&job->job); + job_cancel_sync(&job->job, true); if (sts != JOB_STATUS_CREATED && sts != JOB_STATUS_CONCLUDED) { Job *dummy = &job->job; job_dismiss(&dummy, &error_abort); |