[Xen-changelog] [qemu-upstream-unstable] block migration: fix return value

[patchbot@xxxxxxx]

commit 9fc6075d289702fd6a169dfadc42a52f49f219df
Author:     Gary R Hook <gary.hook@xxxxxxxxxxx>
AuthorDate: Tue Nov 25 17:30:02 2014 -0600
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Sun Feb 22 12:10:06 2015 -0600

    block migration: fix return value
    
    Modify block_save_iterate() to return positive/zero/negative
    (success/not done/failure) return status. The computation of
    the blocks transferred (an int64_t) exceeds the size of an
    int return value.
    
    Signed-off-by: Gary R Hook <gary.hook@xxxxxxxxxxx>
    Reviewed-by: ChenLiang <chenliang88@xxxxxxxxxx>
    Reviewed-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
    Message-id: 1416958202-15913-1-git-send-email-gary.hook@xxxxxxxxxxx
    Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
    (cherry picked from commit ebd9fbd7e102c533143c2c8372312b75c2b2678a)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 block-migration.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/block-migration.c b/block-migration.c
index 08db01a..74d9eb1 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -653,6 +653,7 @@ static int block_save_iterate(QEMUFile *f, void *opaque)
 {
     int ret;
     int64_t last_ftell = qemu_ftell(f);
+    int64_t delta_ftell;
 
     DPRINTF("Enter save live iterate submitted %d transferred %d\n",
             block_mig_state.submitted, block_mig_state.transferred);
@@ -702,7 +703,14 @@ static int block_save_iterate(QEMUFile *f, void *opaque)
     }
 
     qemu_put_be64(f, BLK_MIG_FLAG_EOS);
-    return qemu_ftell(f) - last_ftell;
+    delta_ftell = qemu_ftell(f) - last_ftell;
+    if (delta_ftell > 0) {
+        return 1;
+    } else if (delta_ftell < 0) {
+        return -1;
+    } else {
+        return 0;
+    }
 }
 
 /* Called with iothread lock taken.  */
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog