commit ceb2bd09a13ea71d06353bf826524df3cf584735
author Juan Quintela <quintela@redhat.com> Wed Aug 29 21:37:14 2012 +0200
committer Juan Quintela <quintela@redhat.com> Wed Oct 17 18:34:59 2012 +0200
tree 2c3b6d0c913785c649e780fc1971ead32a24ae24
parent 59feec424723c0cacf503670a42d76e7c47167c1

block-migration:  Switch meaning of return value

Make consistent the result of blk_mig_save_dirty_block() and
mig_save_device_dirty()

Signed-off-by: Juan Quintela <quintela@redhat.com>

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

block-migration.c

diff --git a/block-migration.c b/block-migration.c
index f5ce386..b47a063 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -429,14 +429,18 @@
     return 0;
 }
 
+/* return value:
+ * 0: too much data for max_downtime
+ * 1: few enough data for max_downtime
+*/
 static int blk_mig_save_dirty_block(QEMUFile *f, int is_async)
 {
     BlkMigDevState *bmds;
-    int ret = 0;
+    int ret = 1;
 
     QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
-        if (mig_save_device_dirty(f, bmds, is_async) == 0) {
-            ret = 1;
+        ret = mig_save_device_dirty(f, bmds, is_async);
+        if (ret == 0) {
             break;
         }
     }
@@ -596,7 +600,7 @@
                 block_mig_state.bulk_completed = 1;
             }
         } else {
-            if (blk_mig_save_dirty_block(f, 1) == 0) {
+            if (blk_mig_save_dirty_block(f, 1) != 0) {
                 /* no more dirty blocks */
                 break;
             }
@@ -633,7 +637,7 @@
        all async read completed */
     assert(block_mig_state.submitted == 0);
 
-    while (blk_mig_save_dirty_block(f, 0) != 0) {
+    while (blk_mig_save_dirty_block(f, 0) == 0) {
         /* Do nothing */
     }
     blk_mig_cleanup();