Commit 2a4c7e83 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 



Block layer patches for 2.11.0-rc4

# gpg: Signature made Mon 04 Dec 2017 16:46:07 GMT
# gpg:                using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  blockjob: Make block_job_pause_all() keep a reference to the jobs

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e80a2561 3d5d319e

blockjob.c

+5 −2
Original line number Diff line number Diff line
@@ -730,6 +730,7 @@ void block_job_pause_all(void) 
        AioContext *aio_context = blk_get_aio_context(job->blk);



        aio_context_acquire(aio_context);

        block_job_ref(job);

        block_job_pause(job);

        aio_context_release(aio_context);

    }
@@ -808,12 +809,14 @@ void coroutine_fn block_job_pause_point(BlockJob *job) 


void block_job_resume_all(void)

{

    BlockJob *job = NULL;

    while ((job = block_job_next(job))) {

    BlockJob *job, *next;



    QLIST_FOREACH_SAFE(job, &block_jobs, job_list, next) {

        AioContext *aio_context = blk_get_aio_context(job->blk);



        aio_context_acquire(aio_context);

        block_job_resume(job);

        block_job_unref(job);

        aio_context_release(aio_context);

    }

}