mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: Use g_autofree to simplify ram_dirty_bitmap_reload()

Browse Source 
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231011023627.86691-1-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-10-11 04:36:27 +02:00 committed by Juan Quintela
parent d7f5a04320
commit 1a36e4c9d0
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
migration/ram.c
View File

@ -4159,7 +4159,8 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlock *block)
int ret = -EINVAL; int ret = -EINVAL;
/* from_dst_file is always valid because we're within rp_thread */ /* from_dst_file is always valid because we're within rp_thread */
QEMUFile *file = s->rp_state.from_dst_file; QEMUFile *file = s->rp_state.from_dst_file;
unsigned long *le_bitmap, nbits = block->used_length >> TARGET_PAGE_BITS; g_autofree unsigned long *le_bitmap = NULL;
unsigned long nbits = block->used_length >> TARGET_PAGE_BITS;
uint64_t local_size = DIV_ROUND_UP(nbits, 8); uint64_t local_size = DIV_ROUND_UP(nbits, 8);
uint64_t size, end_mark; uint64_t size, end_mark;
RAMState *rs = ram_state; RAMState *rs = ram_state;
@ -4188,8 +4189,7 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlock *block)
error_report("%s: ramblock '%s' bitmap size mismatch " error_report("%s: ramblock '%s' bitmap size mismatch "
"(0x%"PRIx64" != 0x%"PRIx64")", __func__, "(0x%"PRIx64" != 0x%"PRIx64")", __func__,
block->idstr, size, local_size); block->idstr, size, local_size);
ret = -EINVAL; return -EINVAL;
goto out;
} }
size = qemu_get_buffer(file, (uint8_t *)le_bitmap, local_size); size = qemu_get_buffer(file, (uint8_t *)le_bitmap, local_size);
@ -4200,15 +4200,13 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlock *block)
error_report("%s: read bitmap failed for ramblock '%s': %d" error_report("%s: read bitmap failed for ramblock '%s': %d"
" (size 0x%"PRIx64", got: 0x%"PRIx64")", " (size 0x%"PRIx64", got: 0x%"PRIx64")",
__func__, block->idstr, ret, local_size, size); __func__, block->idstr, ret, local_size, size);
ret = -EIO; return -EIO;
goto out;
} }
if (end_mark != RAMBLOCK_RECV_BITMAP_ENDING) { if (end_mark != RAMBLOCK_RECV_BITMAP_ENDING) {
error_report("%s: ramblock '%s' end mark incorrect: 0x%"PRIx64, error_report("%s: ramblock '%s' end mark incorrect: 0x%"PRIx64,
__func__, block->idstr, end_mark); __func__, block->idstr, end_mark);
ret = -EINVAL; return -EINVAL;
goto out;
} }
/* /*
@ -4240,10 +4238,7 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlock *block)
*/ */
migration_rp_kick(s); migration_rp_kick(s);
ret = 0; return 0;
out:
g_free(le_bitmap);
return ret;
} }
static int ram_resume_prepare(MigrationState *s, void *opaque) static int ram_resume_prepare(MigrationState *s, void *opaque)