mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 01:03:55 -06:00
mirror: Do not clear .cancelled
Clearing .cancelled before leaving the main loop when the job has been soft-cancelled is no longer necessary since job_is_cancelled() only returns true for jobs that have been force-cancelled. Therefore, this only makes a differences in places that call job_cancel_requested(). In block/mirror.c, this is done only before .cancelled was cleared. In job.c, there are two callers: - job_completed_txn_abort() asserts that .cancelled is true, so keeping it true will not affect this place. - job_complete() refuses to let a job complete that has .cancelled set. It is correct to refuse to let the user invoke job-complete on mirror jobs that have already been soft-cancelled. With this change, there are no places that reset .cancelled to false and so we can be sure that .force_cancel can only be true if .cancelled is true as well. Assert this in job_is_cancelled(). Signed-off-by: Hanna Reitz <hreitz@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Message-Id: <20211006151940.214590-13-hreitz@redhat.com> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
This commit is contained in:
parent
9b230ef93e
commit
a640fa0e38
2 changed files with 3 additions and 3 deletions
4
job.c
4
job.c
|
@ -217,7 +217,9 @@ const char *job_type_str(const Job *job)
|
|||
|
||||
bool job_is_cancelled(Job *job)
|
||||
{
|
||||
return job->cancelled && job->force_cancel;
|
||||
/* force_cancel may be true only if cancelled is true, too */
|
||||
assert(job->cancelled || !job->force_cancel);
|
||||
return job->force_cancel;
|
||||
}
|
||||
|
||||
bool job_cancel_requested(Job *job)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue