diff options
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2017-12-15 11:51:23 +0000 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2018-01-15 12:48:04 +0100 |
| commit | bae416e5ba65701d3c5238164517158066d615e5 (patch) | |
| tree | 6d202a56245f3b63c311757527c823f18d377121 | |
| parent | ca6011c2329121ecc25081f884a5d9016acc6572 (diff) | |
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: Xianxian Wang <xianwang@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
| -rw-r--r-- | migration/ram.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/migration/ram.c b/migration/ram.c index 021d583b9b..cb1950f3eb 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -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; |