diff options
| author | Peter Maydell | 2016-09-13 15:31:18 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-09-13 15:31:18 +0200 |
| commit | 4dfbe3767af503a4cd137b15c8a9d8f30b20a6e9 (patch) | |
| tree | 3e58ae8614b0f372f8fe4f4bb27b85263c3e4934 /blockdev.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160913-1' into s... (diff) | |
| parent | iothread: Stop threads before main() quits (diff) | |
| download | qemu-4dfbe3767af503a4cd137b15c8a9d8f30b20a6e9.tar.gz qemu-4dfbe3767af503a4cd137b15c8a9d8f30b20a6e9.tar.xz qemu-4dfbe3767af503a4cd137b15c8a9d8f30b20a6e9.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request
v2:
* Fixed qcow2 sanitizer warnings [Peter]
* Renamed get_error test cases to get_error_all to avoid tripping "error:"
grep scripts [Peter]
* Added Fam's iothread stop patch
# gpg: Signature made Tue 13 Sep 2016 11:02:30 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
iothread: Stop threads before main() quits
tests: fix qvirtqueue_kick
MAINTAINERS: add maintainer for replication
support replication driver in blockdev-add
tests: add unit test case for replication
replication: Implement new driver for block replication
replication: Introduce new APIs to do replication operation
configure: support replication
mirror: auto complete active commit
docs: block replication's description
block: Link backup into block core
Backup: export interfaces for extra serialization
Backup: clear all bitmap when doing block checkpoint
block: unblock backup operations in backing file
virtio-blk: rename virtio_device_info to virtio_blk_info
linux-aio: process completions from ioq_submit()
linux-aio: split processing events function
linux-aio: consume events in userspace instead of calling io_getevents
qcow2: avoid memcpy(dst, NULL, len)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'blockdev.c')
| -rw-r--r-- | blockdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/blockdev.c b/blockdev.c index 97062e33c3..1399fbd931 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3090,7 +3090,7 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device, goto out; } commit_active_start(has_job_id ? job_id : NULL, bs, base_bs, speed, - on_error, block_job_cb, bs, &local_err); + on_error, block_job_cb, bs, &local_err, false); } else { commit_start(has_job_id ? job_id : NULL, bs, base_bs, top_bs, speed, on_error, block_job_cb, bs, |