david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block-migration: Switch meaning of return value

Browse Source 
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>
This commit is contained in:
Juan Quintela 2012-08-29 21:37:14 +02:00
parent 59feec4247
commit ceb2bd09a1
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
block-migration.c
View File

@ -429,14 +429,18 @@ error:
return 0; 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) static int blk_mig_save_dirty_block(QEMUFile *f, int is_async)
{ {
BlkMigDevState *bmds; BlkMigDevState *bmds;
int ret = 0; int ret = 1;
QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) { QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
if (mig_save_device_dirty(f, bmds, is_async) == 0) { ret = mig_save_device_dirty(f, bmds, is_async);
ret = 1; if (ret == 0) {
break; break;
} }
} }
@ -596,7 +600,7 @@ static int block_save_iterate(QEMUFile *f, void *opaque)
block_mig_state.bulk_completed = 1; block_mig_state.bulk_completed = 1;
} }
} else { } else {
if (blk_mig_save_dirty_block(f, 1) == 0) { if (blk_mig_save_dirty_block(f, 1) != 0) {
/* no more dirty blocks */ /* no more dirty blocks */
break; break;
} }
@ -633,7 +637,7 @@ static int block_save_complete(QEMUFile *f, void *opaque)
all async read completed */ all async read completed */
assert(block_mig_state.submitted == 0); 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 */ /* Do nothing */
} }
blk_mig_cleanup(); blk_mig_cleanup();