From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32912) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctcbd-0005nZ-5j for qemu-devel@nongnu.org; Thu, 30 Mar 2017 12:07:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctcbY-0002Pz-8W for qemu-devel@nongnu.org; Thu, 30 Mar 2017 12:07:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47174) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ctcbX-0002PT-Vp for qemu-devel@nongnu.org; Thu, 30 Mar 2017 12:07:20 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0CF4167BCA for ; Thu, 30 Mar 2017 16:07:19 +0000 (UTC) From: Juan Quintela In-Reply-To: <20170330062424.GA19648@pxdev.xzpeter.org> (Peter Xu's message of "Thu, 30 Mar 2017 14:24:24 +0800") References: <20170323204544.12015-1-quintela@redhat.com> <20170323204544.12015-29-quintela@redhat.com> <20170330062424.GA19648@pxdev.xzpeter.org> Reply-To: quintela@redhat.com Date: Thu, 30 Mar 2017 18:07:11 +0200 Message-ID: <87h92an3yo.fsf@secure.mitica> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH 28/51] ram: Remove ram_save_remaining List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Xu Cc: qemu-devel@nongnu.org, dgilbert@redhat.com Peter Xu 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 >> --- >> 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. Thanks, Juan. > > Besides: > > Reviewed-by: Peter Xu > > -- peterx