migration/colo: Add missing error-propagation code
authorPhilippe Mathieu-Daudé <f4bug@amsat.org>
Mon, 13 Apr 2020 20:52:49 +0000 (22:52 +0200)
committerDr. David Alan Gilbert <dgilbert@redhat.com>
Thu, 7 May 2020 16:40:24 +0000 (17:40 +0100)
Running the coccinelle script produced:

  $ spatch \
    --macro-file scripts/cocci-macro-file.h --include-headers \
    --sp-file scripts/coccinelle/find-missing-error_propagate.cocci \
    --keep-comments --smpl-spacing --dir .
  HANDLING: ./migration/colo.c
  [[manual check required: error_propagate() might be missing in migrate_set_block_enabled() ./migration/colo.c:439:4]]

Add the missing error_propagate() after review.

Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200413205250.687-1-f4bug@amsat.org>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
migration/colo.c

index 1b3493729b03a89d58d9de080f7fbbe3863a4559..d015d4f84e2fd709096aa79981966f8aaa47b0c3 100644 (file)
@@ -443,6 +443,9 @@ static int colo_do_checkpoint_transaction(MigrationState *s,
 
     /* Disable block migration */
     migrate_set_block_enabled(false, &local_err);
+    if (local_err) {
+        goto out;
+    }
     qemu_mutex_lock_iothread();
 
 #ifdef CONFIG_REPLICATION