ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block-migration: remove useless calls to blk_mig_cleanup 

Now that the cancel callback is called consistently for all errors,
we can avoid doing its work in the other callbacks.

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-02-22 17:36:11 +01:00 committed by Juan Quintela
parent 04943ebaa9
commit d418cf57a3
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
block-migration.c
View File

@ -524,16 +524,10 @@ static int block_save_setup(QEMUFile *f, void *opaque)
set_dirty_tracking(1); set_dirty_tracking(1);
ret = flush_blks(f); ret = flush_blks(f);
if (ret) {
blk_mig_cleanup();
return ret;
}
blk_mig_reset_dirty_cursor(); blk_mig_reset_dirty_cursor();
qemu_put_be64(f, BLK_MIG_FLAG_EOS); qemu_put_be64(f, BLK_MIG_FLAG_EOS);
return 0; return ret;
} }
static int block_save_iterate(QEMUFile *f, void *opaque) static int block_save_iterate(QEMUFile *f, void *opaque)
@ -546,7 +540,6 @@ static int block_save_iterate(QEMUFile *f, void *opaque)
ret = flush_blks(f); ret = flush_blks(f);
if (ret) { if (ret) {
blk_mig_cleanup();
return ret; return ret;
} }
@ -564,20 +557,18 @@ static int block_save_iterate(QEMUFile *f, void *opaque)
} }
} else { } else {
ret = blk_mig_save_dirty_block(f, 1); ret = blk_mig_save_dirty_block(f, 1);
if (ret < 0) {
return ret;
}
if (ret != 0) { if (ret != 0) {
/* no more dirty blocks */ /* no more dirty blocks */
break; break;
} }
} }
} }
if (ret < 0) {
blk_mig_cleanup();
return ret;
}
ret = flush_blks(f); ret = flush_blks(f);
if (ret) { if (ret) {
blk_mig_cleanup();
return ret; return ret;
} }
@ -595,7 +586,6 @@ static int block_save_complete(QEMUFile *f, void *opaque)
ret = flush_blks(f); ret = flush_blks(f);
if (ret) { if (ret) {
blk_mig_cleanup();
return ret; return ret;
} }
@ -607,12 +597,11 @@ static int block_save_complete(QEMUFile *f, void *opaque)
do { do {
ret = blk_mig_save_dirty_block(f, 0); ret = blk_mig_save_dirty_block(f, 0);
if (ret < 0) {
return ret;
}
} while (ret == 0); } while (ret == 0);
blk_mig_cleanup();
if (ret < 0) {
return ret;
}
/* report completion */ /* report completion */
qemu_put_be64(f, (100 << BDRV_SECTOR_BITS) | BLK_MIG_FLAG_PROGRESS); qemu_put_be64(f, (100 << BDRV_SECTOR_BITS) | BLK_MIG_FLAG_PROGRESS);
@ -620,6 +609,7 @@ static int block_save_complete(QEMUFile *f, void *opaque)
qemu_put_be64(f, BLK_MIG_FLAG_EOS); qemu_put_be64(f, BLK_MIG_FLAG_EOS);
blk_mig_cleanup();
return 0; return 0;
} }