diff options
| author | Emanuele Giuseppe Esposito | 2022-09-26 11:32:03 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2022-10-07 12:11:41 +0200 |
| commit | 279ac06e55698b6152e7a6431f77b4db9d059002 (patch) | |
| tree | a2ccba06c4661cf52d4029f48db105522e661cb3 | |
| parent | jobs: use job locks also in the unit tests (diff) | |
| download | qemu-279ac06e55698b6152e7a6431f77b4db9d059002.tar.gz qemu-279ac06e55698b6152e7a6431f77b4db9d059002.tar.xz qemu-279ac06e55698b6152e7a6431f77b4db9d059002.zip | |
block/mirror.c: use of job helpers in drivers
Once job lock is used and aiocontext is removed, mirror has
to perform job operations under the same critical section,
Note: at this stage, job_{lock/unlock} and job lock guard macros
are *nop*.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-Id: <20220926093214.506243-11-eesposit@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/mirror.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/block/mirror.c b/block/mirror.c index 3c4ab1159d..c6bf7f40ce 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1152,8 +1152,10 @@ static void mirror_complete(Job *job, Error **errp) s->should_complete = true; /* If the job is paused, it will be re-entered when it is resumed */ - if (!job->paused) { - job_enter(job); + WITH_JOB_LOCK_GUARD() { + if (!job->paused) { + job_enter_cond_locked(job, NULL); + } } } @@ -1173,8 +1175,11 @@ static bool mirror_drained_poll(BlockJob *job) * from one of our own drain sections, to avoid a deadlock waiting for * ourselves. */ - if (!s->common.job.paused && !job_is_cancelled(&job->job) && !s->in_drain) { - return true; + WITH_JOB_LOCK_GUARD() { + if (!s->common.job.paused && !job_is_cancelled_locked(&job->job) + && !s->in_drain) { + return true; + } } return !!s->in_flight; |