Commit bae416e5 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Juan Quintela
Browse files

migration: Guard ram_bytes_remaining against early call 

Calling ram_bytes_remaining during the early part of setup is unsafe
because the ram_state isn't yet initialised.

This can happen in the sequence:
   migrate
   migrate_cancel
   info migrate

if the migrate sticks trying to connect (e.g. to an unresponsive
destination due to the connect timeout).  Here 'info migrate' sees
a state of CANCELLING and so assumes the migrate has partially happened.

partial fix for:
RH bz: https://bugzilla.redhat.com/show_bug.cgi?id=1525899


Reported-by: default avatarXianxian Wang <xianwang@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent ca6011c2

migration/ram.c

+2 −1
Original line number Diff line number Diff line
@@ -237,7 +237,8 @@ static RAMState *ram_state; 


uint64_t ram_bytes_remaining(void)

{

    return ram_state->migration_dirty_pages * TARGET_PAGE_SIZE;

    return ram_state ? (ram_state->migration_dirty_pages * TARGET_PAGE_SIZE) :

                       0;

}



MigrationStats ram_counters;