diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-07 19:12:45 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-07 19:12:45 +0100 |
| commit | 30c6672aa4b4bc9bdba3a7e46c49bba191660143 (patch) | |
| tree | 54f3f6fdf324a65a5d654cd18b6fb9ce1b934395 /migration | |
| parent | 9861b71fd63f04175fddd1e93a417bae4a7808d7 (diff) | |
| parent | 970311646a701eecb103eb28093e8924d2fa6861 (diff) | |
| download | qemu-30c6672aa4b4bc9bdba3a7e46c49bba191660143.tar.gz | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request
v2:
* Drop block/nfs patch since it exposes an unfinished QAPI interface [kwolf]
# gpg: Signature made Tue Jul 7 14:29:47 2015 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/block-pull-request:
blockjob: add block_job_release function
block/raw-posix: Don't think /dev/fd/<NN> is a floppy drive.
block: Use bdrv_drain to replace uncessary bdrv_drain_all
block: Initialize local_err in bdrv_append_temp_snapshot
block: update bdrv_drain_all()/bdrv_drain() comments
qcow2: remove unnecessary check
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/block.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/migration/block.c b/migration/block.c index ddb59ccf87..ed865ed23b 100644 --- a/migration/block.c +++ b/migration/block.c @@ -457,7 +457,7 @@ static int mig_save_device_dirty(QEMUFile *f, BlkMigDevState *bmds, blk_mig_lock(); if (bmds_aio_inflight(bmds, sector)) { blk_mig_unlock(); - bdrv_drain_all(); + bdrv_drain(bmds->bs); } else { blk_mig_unlock(); } |