[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/19] block migration: fix return value
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 01/19] block migration: fix return value |
Date: |
Fri, 12 Dec 2014 17:09:47 +0000 |
From: Gary R Hook <address@hidden>
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 <address@hidden>
Reviewed-by: ChenLiang <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block-migration.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
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. */
--
2.1.0
- [Qemu-devel] [PULL 00/19] Block patches, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 01/19] block migration: fix return value,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 02/19] vmdk: Fix error for JSON descriptor file names, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 03/19] iotests: Add test for vmdk JSON file names, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 04/19] block/rbd: fix memory leak, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 05/19] block: vhdx - remove redundant comments, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 06/19] block: vhdx - update PAYLOAD_BLOCK_UNMAPPED value to match 1.00 spec, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 07/19] block: vhdx - change .vhdx_create default block state to ZERO, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 08/19] qemu-io: Add sigraise command, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 09/19] iotests: Filter for "Killed" in qemu-io output, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 10/19] iotests: Fix test 039, Stefan Hajnoczi, 2014/12/12
- [Qemu-devel] [PULL 11/19] block: vhdx - set .bdrv_has_zero_init to bdrv_has_zero_init_1, Stefan Hajnoczi, 2014/12/12