mirror of https://github.com/xemu-project/xemu.git
migration: Add Error** argument to ram_state_init()
Since the return value not exploited, follow the recommendations of qapi/error.h and change it to a bool Signed-off-by: Cédric Le Goater <clg@redhat.com> Reviewed-by: Fabiano Rosas <farosas@suse.de> Link: https://lore.kernel.org/r/20240320064911.545001-13-clg@redhat.com Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
parent
639ec3fbf9
commit
16ecd25a4f
|
@ -2780,13 +2780,13 @@ err_out:
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
static int ram_state_init(RAMState **rsp)
|
||||
static bool ram_state_init(RAMState **rsp, Error **errp)
|
||||
{
|
||||
*rsp = g_try_new0(RAMState, 1);
|
||||
|
||||
if (!*rsp) {
|
||||
error_report("%s: Init ramstate fail", __func__);
|
||||
return -1;
|
||||
error_setg(errp, "%s: Init ramstate fail", __func__);
|
||||
return false;
|
||||
}
|
||||
|
||||
qemu_mutex_init(&(*rsp)->bitmap_mutex);
|
||||
|
@ -2802,7 +2802,7 @@ static int ram_state_init(RAMState **rsp)
|
|||
(*rsp)->migration_dirty_pages = (*rsp)->ram_bytes_total >> TARGET_PAGE_BITS;
|
||||
ram_state_reset(*rsp);
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static void ram_list_init_bitmaps(void)
|
||||
|
@ -2897,7 +2897,10 @@ out_unlock:
|
|||
|
||||
static int ram_init_all(RAMState **rsp)
|
||||
{
|
||||
if (ram_state_init(rsp)) {
|
||||
Error *local_err = NULL;
|
||||
|
||||
if (!ram_state_init(rsp, &local_err)) {
|
||||
error_report_err(local_err);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -3624,7 +3627,11 @@ void ram_handle_zero(void *host, uint64_t size)
|
|||
|
||||
static void colo_init_ram_state(void)
|
||||
{
|
||||
ram_state_init(&ram_state);
|
||||
Error *local_err = NULL;
|
||||
|
||||
if (!ram_state_init(&ram_state, &local_err)) {
|
||||
error_report_err(local_err);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue