On Thu, Mar 30, 2017 at 06:07:11PM +0200, Juan Quintela wrote:
> Peter Xu <pet...@redhat.com> wrote:
> > On Thu, Mar 23, 2017 at 09:45:21PM +0100, Juan Quintela wrote:
> >> Just unfold it. Move ram_bytes_remaining() with the rest of exported
> >> functions.
> >>
> >> Signed-off-by: Juan Quintela <quint...@redhat.com>
> >> ---
> >> migration/ram.c | 19 +++++++------------
> >> 1 file changed, 7 insertions(+), 12 deletions(-)
> >>
> >> diff --git a/migration/ram.c b/migration/ram.c
> >> index 3ae00e2..dd5a453 100644
> >> --- a/migration/ram.c
> >> +++ b/migration/ram.c
> >> @@ -243,16 +243,16 @@ uint64_t xbzrle_mig_pages_overflow(void)
> >> return ram_state.xbzrle_overflows;
> >> }
> >>
> >> -static ram_addr_t ram_save_remaining(void)
> >> -{
> >> - return ram_state.migration_dirty_pages;
> >> -}
> >> -
> >> uint64_t ram_bytes_transferred(void)
> >> {
> >> return ram_state.bytes_transferred;
> >> }
> >>
> >> +uint64_t ram_bytes_remaining(void)
> >> +{
> >> + return ram_state.migration_dirty_pages * TARGET_PAGE_SIZE;
> >> +}
> >> +
> >> /* used by the search for pages to send */
> >> struct PageSearchStatus {
> >> /* Current block being searched */
> >> @@ -1438,11 +1438,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;
> >> @@ -2210,7 +2205,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;
> >
> > Here we can directly use ram_bytes_remaining()?
> >
> >>
> >> if (!migration_in_postcopy(migrate_get_current()) &&
> >> remaining_size < max_size) {
> >> @@ -2219,7 +2214,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;
> >
> > Same here?
>
> To be consistent, I tried not to use the "accessor" functions inside
> this file. If you are in ram.c, you have to know about RAMstate.
Then I'm okay with it. Thanks!
-- peterx
