From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1XBu-0002NC-OK for qemu-devel@nongnu.org; Fri, 21 Apr 2017 07:57:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1XBu-0007TZ-2q for qemu-devel@nongnu.org; Fri, 21 Apr 2017 07:57:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60244) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1XBt-0007TA-U2 for qemu-devel@nongnu.org; Fri, 21 Apr 2017 07:57:34 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D25DEC04B326 for ; Fri, 21 Apr 2017 11:57:32 +0000 (UTC) From: Juan Quintela Date: Fri, 21 Apr 2017 13:56:12 +0200 Message-Id: <20170421115646.15544-32-quintela@redhat.com> In-Reply-To: <20170421115646.15544-1-quintela@redhat.com> References: <20170421115646.15544-1-quintela@redhat.com> Subject: [Qemu-devel] [PULL 31/65] ram: Remove ram_save_remaining List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dgilbert@redhat.com Just unfold it. Move ram_bytes_remaining() with the rest of exported functions. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu --- migration/ram.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index cd7226e..2f5cbd1 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -244,16 +244,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 */ @@ -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 */ -- 2.9.3