diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-03-22 18:58:50 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-05-19 16:45:31 +0200 |
| commit | 7c8eece45b10fc9b716850345118ed6fa8d17887 (patch) | |
| tree | a800da22963a8ff1d036a97a3281ddd555d07c91 /migration/block.c | |
| parent | dde33812a83b9c55b180a85411bfc4d6c39e8b11 (diff) | |
| download | focaccia-qemu-7c8eece45b10fc9b716850345118ed6fa8d17887.tar.gz focaccia-qemu-7c8eece45b10fc9b716850345118ed6fa8d17887.zip | |
block: Avoid bs->blk in bdrv_next()
We need to introduce a separate BdrvNextIterator struct that can keep more state than just the current BDS in order to avoid using the bs->blk pointer. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'migration/block.c')
| -rw-r--r-- | migration/block.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/migration/block.c b/migration/block.c index 1743317288..a7a76a0fb9 100644 --- a/migration/block.c +++ b/migration/block.c @@ -383,6 +383,7 @@ static void init_blk_migration(QEMUFile *f) BlockDriverState *bs; BlkMigDevState *bmds; int64_t sectors; + BdrvNextIterator *it = NULL; block_mig_state.submitted = 0; block_mig_state.read_done = 0; @@ -392,7 +393,8 @@ static void init_blk_migration(QEMUFile *f) block_mig_state.bulk_completed = 0; block_mig_state.zero_blocks = migrate_zero_blocks(); - for (bs = bdrv_next(NULL); bs; bs = bdrv_next(bs)) { + + while ((it = bdrv_next(it, &bs))) { if (bdrv_is_read_only(bs)) { continue; } |