diff options
| author | Peter Maydell | 2017-11-29 17:25:23 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-11-29 17:25:23 +0100 |
| commit | 915308bc3f0f4815ba95b27f424edc96f7853278 (patch) | |
| tree | 183bbb703c578b493215e3c9b9af4f233d02588c /block/commit.c | |
| parent | Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-11-28' into st... (diff) | |
| parent | Merge remote-tracking branch 'mreitz/tags/pull-block-2017-11-29' into queue-b... (diff) | |
| download | qemu-915308bc3f0f4815ba95b27f424edc96f7853278.tar.gz qemu-915308bc3f0f4815ba95b27f424edc96f7853278.tar.xz qemu-915308bc3f0f4815ba95b27f424edc96f7853278.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.11.0-rc3
# gpg: Signature made Wed 29 Nov 2017 15:25:13 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:
block/nfs: fix nfs_client_open for filesize greater than 1TB
blockjob: reimplement block_job_sleep_ns to allow cancellation
blockjob: introduce block_job_do_yield
blockjob: remove clock argument from block_job_sleep_ns
block: Expect graph changes in bdrv_parent_drained_begin/end
blockjob: Remove the job from the list earlier in block_job_unref()
QAPI & interop: Clarify events emitted by 'block-job-cancel'
qemu-options: Mention locking option of file driver
docs: Add image locking subsection
iotests: fix 075 and 078
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/commit.c')
| -rw-r--r-- | block/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/commit.c b/block/commit.c index 5036eec434..c5327551ce 100644 --- a/block/commit.c +++ b/block/commit.c @@ -174,7 +174,7 @@ static void coroutine_fn commit_run(void *opaque) /* Note that even when no rate limit is applied we need to yield * with no pending I/O here so that bdrv_drain_all() returns. */ - block_job_sleep_ns(&s->common, QEMU_CLOCK_REALTIME, delay_ns); + block_job_sleep_ns(&s->common, delay_ns); if (block_job_is_cancelled(&s->common)) { break; } |