[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 26/65] ram: Everything was init to zero, so use memse
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 26/65] ram: Everything was init to zero, so use memset |
Date: |
Fri, 21 Apr 2017 13:56:07 +0200 |
And then init only things that are not zero by default.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
---
migration/ram.c | 25 +++----------------------
1 file changed, 3 insertions(+), 22 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 71f8ef3..42bb82f 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -612,15 +612,6 @@ static void migration_bitmap_sync_range(RAMState *rs,
ram_addr_t start,
&rs->num_dirty_pages_period);
}
-static void migration_bitmap_sync_init(RAMState *rs)
-{
- rs->time_last_bitmap_sync = 0;
- rs->bytes_xfer_prev = 0;
- rs->num_dirty_pages_period = 0;
- rs->xbzrle_cache_miss_prev = 0;
- rs->iterations_prev = 0;
-}
-
/**
* ram_pagesize_summary: calculate all the pagesizes of a VM
*
@@ -1986,21 +1977,11 @@ err:
return ret;
}
-static int ram_save_init_globals(RAMState *rs)
+static int ram_state_init(RAMState *rs)
{
int64_t ram_bitmap_pages; /* Size of bitmap in pages, including gaps */
- rs->dirty_rate_high_cnt = 0;
- rs->bitmap_sync_count = 0;
- rs->zero_pages = 0;
- rs->norm_pages = 0;
- rs->iterations = 0;
- rs->xbzrle_bytes = 0;
- rs->xbzrle_pages = 0;
- rs->xbzrle_cache_miss = 0;
- rs->xbzrle_cache_miss_rate = 0;
- rs->xbzrle_overflows = 0;
- migration_bitmap_sync_init(rs);
+ memset(rs, 0, sizeof(*rs));
qemu_mutex_init(&migration_bitmap_mutex);
if (migrate_use_xbzrle()) {
@@ -2090,7 +2071,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque)
/* migration has already setup the bitmap, reuse it. */
if (!migration_in_colo_state()) {
- if (ram_save_init_globals(rs) < 0) {
+ if (ram_state_init(rs) < 0) {
return -1;
}
}
--
2.9.3
- [Qemu-devel] [PULL 15/65] ram: Remove unused dup_mig_bytes_transferred(), (continued)
- [Qemu-devel] [PULL 15/65] ram: Remove unused dup_mig_bytes_transferred(), Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 17/65] ram: Move norm_pages to RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 18/65] ram: Remove norm_mig_bytes_transferred, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 19/65] ram: Move iterations into RAMState, Juan Quintela, 2017/04/21
- [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 <=
- [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, 2017/04/21
- [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