diff options
| author | Peter Maydell | 2018-03-19 12:44:26 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-03-19 12:44:26 +0100 |
| commit | 2c8cfc0b52b5a4d123c26c0b5fdf941be24805be (patch) | |
| tree | 7478be50ee491356e6edcac1fc3c41e45c546c94 /block/commit.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/seabios-1.11.1-20180319-pul... (diff) | |
| parent | iotests: Avoid realpath, for CentOS 6 (diff) | |
| download | qemu-2c8cfc0b52b5a4d123c26c0b5fdf941be24805be.tar.gz qemu-2c8cfc0b52b5a4d123c26c0b5fdf941be24805be.tar.xz qemu-2c8cfc0b52b5a4d123c26c0b5fdf941be24805be.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches
# gpg: Signature made Mon 19 Mar 2018 11:01:45 GMT
# gpg: using RSA key 7F09B272C88F2FD6
# 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: (46 commits)
iotests: Avoid realpath, for CentOS 6
block: fix iotest 146 output expectations
iscsi: fix iSER compilation
block: Fix leak of ignore_children in error path
vvfat: Fix inherit_options flags
block/mirror: change the semantic of 'force' of block-job-cancel
vpc: Require aligned size in .bdrv_co_create
vpc: Support .bdrv_co_create
vhdx: Support .bdrv_co_create
vdi: Make comments consistent with other drivers
qed: Support .bdrv_co_create
qcow: Support .bdrv_co_create
qemu-iotests: Enable write tests for parallels
parallels: Support .bdrv_co_create
iotests: Add regression test for commit base locking
block: Fix flags in reopen queue
vdi: Implement .bdrv_co_create
vdi: Move file creation to vdi_co_create_opts
vdi: Pull option parsing from vdi_co_create
qemu-iotests: Test luks QMP image creation
...
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 1943c9c3e1..ab4fa3c3cf 100644 --- a/block/commit.c +++ b/block/commit.c @@ -289,7 +289,7 @@ void commit_start(const char *job_id, BlockDriverState *bs, return; } - s = block_job_create(job_id, &commit_job_driver, bs, 0, BLK_PERM_ALL, + s = block_job_create(job_id, &commit_job_driver, NULL, bs, 0, BLK_PERM_ALL, speed, BLOCK_JOB_DEFAULT, NULL, NULL, errp); if (!s) { return; |