diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-04-07 19:12:45 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-04-07 19:12:45 +0100 |
| commit | 2f37b0222cf9274d014fcb1f211b14ee626561c9 (patch) | |
| tree | 1fbda138b833507eb137fe7f5971417a5d64fd9a /tests | |
| parent | 339205e7ef370663b329e34fd9e905ca00321aa4 (diff) | |
| parent | 3f6de653b946fe849330208becf79d6af7e876cb (diff) | |
| download | qemu-2f37b0222cf9274d014fcb1f211b14ee626561c9.zip qemu-2f37b0222cf9274d014fcb1f211b14ee626561c9.tar.gz qemu-2f37b0222cf9274d014fcb1f211b14ee626561c9.tar.bz2 | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:
- Fix crashes and hangs related to iothreads, bdrv_drain and block jobs:
- Fix some AIO context locking in jobs
- Fix blk->in_flight during blk_wait_while_drained()
- vpc: Don't round up already aligned BAT sizes
# gpg: Signature made Tue 07 Apr 2020 15:25:24 BST
# gpg: using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
vpc: Don't round up already aligned BAT sizes
block: Fix blk->in_flight during blk_wait_while_drained()
block: Increase BB.in_flight for coroutine and sync interfaces
block-backend: Reorder flush/pdiscard function definitions
backup: don't acquire aio_context in backup_clean
replication: assert we own context before job_cancel_sync
job: take each job's lock individually in job_txn_apply
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-blockjob.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/test-blockjob.c b/tests/test-blockjob.c index 4eeb184..7519847 100644 --- a/tests/test-blockjob.c +++ b/tests/test-blockjob.c @@ -367,7 +367,9 @@ static void test_cancel_concluded(void) aio_poll(qemu_get_aio_context(), true); assert(job->status == JOB_STATUS_PENDING); + aio_context_acquire(job->aio_context); job_finalize(job, &error_abort); + aio_context_release(job->aio_context); assert(job->status == JOB_STATUS_CONCLUDED); cancel_common(s); |