]> git.proxmox.com Git - mirror_qemu.git/commitdiff
migration/savevm: remove duplicate check of migration_is_blocked
authorWei Yang <richardw.yang@linux.intel.com>
Wed, 24 Apr 2019 00:46:57 +0000 (08:46 +0800)
committerDr. David Alan Gilbert <dgilbert@redhat.com>
Tue, 14 May 2019 16:33:35 +0000 (17:33 +0100)
Current call flow of save_snapshot is:

  save_snapshot
    migration_is_blocked
      qemu_savevm_state
        migration_is_blocked

Since qemu_savevm_state is only called in save_snapshot, this means
migration_is_blocked has been already checked.

Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Message-Id: <20190424004700.12766-2-richardw.yang@linux.intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
migration/savevm.c

index 81a9a2ef30b07eea03eaac1593fbfd404bb773f9..6e8912af49f4fb10747ddebe31f0b71d3d9b8095 100644 (file)
@@ -1418,10 +1418,6 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
         return -EINVAL;
     }
 
-    if (migration_is_blocked(errp)) {
-        return -EINVAL;
-    }
-
     if (migrate_use_block()) {
         error_setg(errp, "Block migration and snapshots are incompatible");
         return -EINVAL;