[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 31/65] ram: Remove ram_save_remaining
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 31/65] ram: Remove ram_save_remaining |
Date: |
Fri, 21 Apr 2017 13:56:12 +0200 |
Just unfold it. Move ram_bytes_remaining() with the rest of exported
functions.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
---
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
- [Qemu-devel] [PULL 20/65] ram: Move xbzrle_bytes into RAMState, (continued)
- [Qemu-devel] [PULL 20/65] ram: Move xbzrle_bytes into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 21/65] ram: Move xbzrle_pages into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 23/65] ram: Move xbzrle_cache_miss_rate into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 24/65] ram: Move xbzrle_overflows into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 22/65] ram: Move xbzrle_cache_miss into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 25/65] ram: Move migration_dirty_pages to RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 26/65] ram: Everything was init to zero, so use memset, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 27/65] ram: Move migration_bitmap_mutex into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 29/65] ram: Move bytes_transferred into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 28/65] ram: Move migration_bitmap_rcu into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 31/65] ram: Remove ram_save_remaining,
Juan Quintela <=
- [Qemu-devel] [PULL 30/65] ram: Use the RAMState bytes_transferred parameter, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 32/65] ram: Move last_req_rb to RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 33/65] ram: Move src_page_req* to RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 34/65] ram: Create ram_dirty_sync_count(), Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 35/65] ram: Remove dirty_bytes_rate, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 36/65] ram: Move dirty_pages_rate to RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 37/65] ram: Move postcopy_requests into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 38/65] ram: Add QEMUFile to RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 39/65] ram: Move QEMUFile into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 40/65] ram: Remove compression_switch and inline its logic, Juan Quintela, 2017/04/21