qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

Revert "migration: Don't activate block devices if using -S"

This reverts commit 0746a92612276aee69e66dfe6782b0f882d221d5.
Discussion with kwolf suggests this is actually an API change that
we need to gate on a capability. Push to 2.13.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

+7 -15
+7 -15
migration/migration.c
··· 306 306 Error *local_err = NULL; 307 307 MigrationIncomingState *mis = opaque; 308 308 309 - /* Only fire up the block code now if we're going to restart the 310 - * VM, else 'cont' will do it. 311 - * This causes file locking to happen; so we don't want it to happen 312 - * unless we really are starting the VM. 313 - */ 314 - if (autostart && (!global_state_received() || 315 - global_state_get_runstate() == RUN_STATE_RUNNING)) { 316 - /* Make sure all file formats flush their mutable metadata. 317 - * If we get an error here, just don't restart the VM yet. */ 318 - bdrv_invalidate_cache_all(&local_err); 319 - if (local_err) { 320 - error_report_err(local_err); 321 - local_err = NULL; 322 - autostart = false; 323 - } 309 + /* Make sure all file formats flush their mutable metadata. 310 + * If we get an error here, just don't restart the VM yet. */ 311 + bdrv_invalidate_cache_all(&local_err); 312 + if (local_err) { 313 + error_report_err(local_err); 314 + local_err = NULL; 315 + autostart = false; 324 316 } 325 317 326 318 /*