The following changes since commit 326ff8dd09556fc2e257196c49f35009700794ac:
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging (2021-09-20 16:17:05 +0100) are available in the Git repository at: https://src.openvz.org/scm/~vsementsov/qemu.git tags/pull-jobs-2021-09-21 for you to fetch changes up to c9489c04319cac75c76af8fc27c254f46e10214c: iotests: Add mirror-ready-cancel-error test (2021-09-21 11:56:11 +0300) ---------------------------------------------------------------- mirror: Handle errors after READY cancel ---------------------------------------------------------------- Hanna Reitz (12): 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: 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 include/qemu/job.h | 29 ++++++--- block/backup.c | 3 +- block/mirror.c | 56 +++++++++-------- block/replication.c | 4 +- blockdev.c | 4 +- job.c | 64 +++++++++++++++---- 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 +- 11 files changed, 286 insertions(+), 86 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.29.2
