The following changes since commit 9618c5badaa8eed25259cf095ff880efb939fbe7:
Merge remote-tracking branch 'remotes/vivier/tags/trivial-branch-for-6.2-pull-request' into staging (2021-10-04 16:27:35 -0700) are available in the Git repository at: https://src.openvz.org/scm/~vsementsov/qemu.git tags/pull-jobs-2021-10-07-v2 for you to fetch changes up to 2451f72527d8760566a499b7513e17aaceb0f131: iotests: Add mirror-ready-cancel-error test (2021-10-07 10:42:50 +0200) ---------------------------------------------------------------- mirror: Handle errors after READY cancel v2: add small fix by Stefano, Hanna's series fixed ---------------------------------------------------------------- Hanna Reitz (13): job: Context changes in job_completed_txn_abort() mirror: Keep s->synced on error mirror: Drop s->synced job: Force-cancel jobs in a failed transaction job: @force parameter for job_cancel_sync() jobs: Give Job.force_cancel more meaning job: Do not soft-cancel after a job is done job: Add job_cancel_requested() mirror: Use job_is_cancelled() mirror: Check job_is_cancelled() earlier mirror: Stop active mirroring after force-cancel mirror: Do not clear .cancelled iotests: Add mirror-ready-cancel-error test Stefano Garzarella (2): block/backup: avoid integer overflow of `max-workers` block/aio_task: assert `max_busy_tasks` is greater than 0 include/qemu/job.h | 29 ++++++--- block/aio_task.c | 2 + block/backup.c | 7 ++- block/mirror.c | 56 +++++++++-------- block/replication.c | 4 +- blockdev.c | 4 +- job.c | 94 +++++++++++++++++++++++----- tests/unit/test-blockjob.c | 2 +- tests/qemu-iotests/109.out | 60 ++++++++---------- tests/qemu-iotests/tests/mirror-ready-cancel-error | 143 +++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/tests/mirror-ready-cancel-error.out | 5 ++ tests/qemu-iotests/tests/qsd-jobs.out | 2 +- 12 files changed, 316 insertions(+), 92 deletions(-) create mode 100755 tests/qemu-iotests/tests/mirror-ready-cancel-error create mode 100644 tests/qemu-iotests/tests/mirror-ready-cancel-error.out -- 2.31.1
