diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-12 09:29:49 -0400 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-12 10:39:08 -0400 |
| commit | 3753e255da8f6a654c3e7b650a2d27734bec15f9 (patch) | |
| tree | e2cb28dba28a48ecb3c9912900f74c861620d03a /qmp.c | |
| parent | ecc1f5adeec4e3324d1b695a7c54e3967c526949 (diff) | |
| parent | d541e201bd3ad888f02abeddf0e14f7b0c126529 (diff) | |
| download | focaccia-qemu-3753e255da8f6a654c3e7b650a2d27734bec15f9.tar.gz focaccia-qemu-3753e255da8f6a654c3e7b650a2d27734bec15f9.zip | |
Merge remote-tracking branch 'kwolf/tags/for-upstream' into staging
Block layer patches # gpg: Signature made Thu 11 May 2017 10:31:37 AM EDT # 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 * kwolf/tags/for-upstream: (58 commits) MAINTAINERS: Add qemu-progress to the block layer qcow2: Discard/zero clusters by byte count qcow2: Assert that cluster operations are aligned qcow2: Optimize write zero of unaligned tail cluster iotests: Add test 179 to cover write zeroes with unmap iotests: Improve _filter_qemu_img_map qcow2: Optimize zero_single_l2() to minimize L2 churn qcow2: Make distinction between zero cluster types obvious qcow2: Name typedef for cluster type qcow2: Correctly report status of preallocated zero clusters block: Update comments on BDRV_BLOCK_* meanings qcow2: Use consistent switch indentation qcow2: Nicer variable names in qcow2_update_snapshot_refcount() tests: Add coverage for recent block geometry fixes blkdebug: Add ability to override unmap geometries blkdebug: Simplify override logic blkdebug: Add pass-through write_zero and discard support blkdebug: Refactor error injection blkdebug: Sanity check block layer guarantees qemu-io: Switch 'map' output to byte-based reporting ... Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'qmp.c')
| -rw-r--r-- | qmp.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/qmp.c b/qmp.c index ab74cd729d..f656940769 100644 --- a/qmp.c +++ b/qmp.c @@ -196,18 +196,12 @@ void qmp_cont(Error **errp) } /* Continuing after completed migration. Images have been inactivated to - * allow the destination to take control. Need to get control back now. */ - if (runstate_check(RUN_STATE_FINISH_MIGRATE) || - runstate_check(RUN_STATE_POSTMIGRATE)) - { - bdrv_invalidate_cache_all(&local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } - } - - blk_resume_after_migration(&local_err); + * allow the destination to take control. Need to get control back now. + * + * If there are no inactive block nodes (e.g. because the VM was just + * paused rather than completing a migration), bdrv_inactivate_all() simply + * doesn't do anything. */ + bdrv_invalidate_cache_all(&local_err); if (local_err) { error_propagate(errp, local_err); return; |