diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-26 22:36:34 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-26 22:36:35 +0000 |
| commit | 091e3e3dbc499d84c004e1c50bc9870af37f6e99 (patch) | |
| tree | 73de2336b2a506d99bdd2c6525bc978fa8c563fa | |
| parent | 1dc887329a10903940501b43e8c0cc67af7c06d5 (diff) | |
| parent | a024890a64085d3d37ad7eda164775251285c14c (diff) | |
| download | qemu-091e3e3dbc499d84c004e1c50bc9870af37f6e99.zip qemu-091e3e3dbc499d84c004e1c50bc9870af37f6e99.tar.gz qemu-091e3e3dbc499d84c004e1c50bc9870af37f6e99.tar.bz2 | |
Merge remote-tracking branch 'remotes/ericb/tags/pull-bitmaps-2020-10-26' into staging
bitmaps patches for 2020-10-26
- fix infloop on large bitmap granularity
- silence compiler warning
# gpg: Signature made Mon 26 Oct 2020 11:56:54 GMT
# gpg: using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
# gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full]
# gpg: aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A
* remotes/ericb/tags/pull-bitmaps-2020-10-26:
migration/block-dirty-bitmap: fix uninitialized variable warning
migration/block-dirty-bitmap: fix larger granularity bitmaps
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | migration/block-dirty-bitmap.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index 5bef793..c61d382 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -562,8 +562,9 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs, dbms->bitmap_alias = g_strdup(bitmap_alias); dbms->bitmap = bitmap; dbms->total_sectors = bdrv_nb_sectors(bs); - dbms->sectors_per_chunk = CHUNK_SIZE * 8 * - bdrv_dirty_bitmap_granularity(bitmap) >> BDRV_SECTOR_BITS; + dbms->sectors_per_chunk = CHUNK_SIZE * 8LLU * + (bdrv_dirty_bitmap_granularity(bitmap) >> BDRV_SECTOR_BITS); + assert(dbms->sectors_per_chunk != 0); if (bdrv_dirty_bitmap_enabled(bitmap)) { dbms->flags |= DIRTY_BITMAP_MIG_START_FLAG_ENABLED; } @@ -1071,18 +1072,15 @@ static int dirty_bitmap_load_header(QEMUFile *f, DBMLoadState *s, return -EINVAL; } - if (!s->cancelled) { - if (bitmap_alias_map) { - bitmap_name = g_hash_table_lookup(bitmap_alias_map, - s->bitmap_alias); - if (!bitmap_name) { - error_report("Error: Unknown bitmap alias '%s' on node " - "'%s' (alias '%s')", s->bitmap_alias, - s->bs->node_name, s->node_alias); - cancel_incoming_locked(s); - } - } else { - bitmap_name = s->bitmap_alias; + bitmap_name = s->bitmap_alias; + if (!s->cancelled && bitmap_alias_map) { + bitmap_name = g_hash_table_lookup(bitmap_alias_map, + s->bitmap_alias); + if (!bitmap_name) { + error_report("Error: Unknown bitmap alias '%s' on node " + "'%s' (alias '%s')", s->bitmap_alias, + s->bs->node_name, s->node_alias); + cancel_incoming_locked(s); } } |