diff options
| author | Juan Quintela <quintela@redhat.com> | 2017-03-14 12:02:16 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-04-21 12:25:37 +0200 |
| commit | 9edabd4de6babf36f110c99a05b1558834535ec8 (patch) | |
| tree | 140935aea72675cb7624b38b349dd600f0d00307 | |
| parent | 072c251157d0903f895bd05280867eb869d14854 (diff) | |
| download | qemu-9edabd4de6babf36f110c99a05b1558834535ec8.tar.gz | |
ram: Remove ram_save_remaining
Just unfold it. Move ram_bytes_remaining() with the rest of exported
functions.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
| -rw-r--r-- | migration/ram.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/migration/ram.c b/migration/ram.c index cd7226ee4b..2f5cbd1727 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -244,14 +244,14 @@ uint64_t xbzrle_mig_pages_overflow(void) return ram_state.xbzrle_overflows; } -static ram_addr_t ram_save_remaining(void) +uint64_t ram_bytes_transferred(void) { - return ram_state.migration_dirty_pages; + return ram_state.bytes_transferred; } -uint64_t ram_bytes_transferred(void) +uint64_t ram_bytes_remaining(void) { - return ram_state.bytes_transferred; + return ram_state.migration_dirty_pages * TARGET_PAGE_SIZE; } /* used by the search for pages to send */ @@ -1440,11 +1440,6 @@ void acct_update_position(QEMUFile *f, size_t size, bool zero) } } -uint64_t ram_bytes_remaining(void) -{ - return ram_save_remaining() * TARGET_PAGE_SIZE; -} - uint64_t ram_bytes_total(void) { RAMBlock *block; @@ -2212,7 +2207,7 @@ static void ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size, RAMState *rs = opaque; uint64_t remaining_size; - remaining_size = ram_save_remaining() * TARGET_PAGE_SIZE; + remaining_size = rs->migration_dirty_pages * TARGET_PAGE_SIZE; if (!migration_in_postcopy(migrate_get_current()) && remaining_size < max_size) { @@ -2221,7 +2216,7 @@ static void ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size, migration_bitmap_sync(rs); rcu_read_unlock(); qemu_mutex_unlock_iothread(); - remaining_size = ram_save_remaining() * TARGET_PAGE_SIZE; + remaining_size = rs->migration_dirty_pages * TARGET_PAGE_SIZE; } /* We can do postcopy, and all the data is postcopiable */ |